Squashed 'src/chiabls/' changes from 4ec2ecc777..5c0be19abc

5c0be19abc Merge PIVX-Project/bls-signatures#21: Add fix for RELIC parsing invalid inputs.
144680469e Merge PIVX-Project/bls-signatures#20: CMake: Squelch implicit conversion warnings
98d6c06453 Merge PIVX-Project/bls-signatures#19: [GA] Add macOS/Ubuntu latest runners
adb71101a3 Add fix for RELIC parsing invalid inputs.
4581ffab2c CMake: Squelch implicit conversion warnings
6b178f9f94 [GA] Add macOS/Ubuntu latest runners
188967ec6c Merge PIVX-Project/bls-signatures#18: Autotools: Bump relic version
9c27c3a468 Merge PIVX-Project/bls-signatures#17: Update Relic git-tag
fa5c05a5dd Autotools: Consistently use explicit quoting and improve readability
7a069139c1 build: Update autotools Makefile.am for new relic
779fdb24b7 Merge commit '98c9be9bc82c69b146a010a26c03e3ead7387624' into 2023_contrib-relic-bump
98c9be9bc8 Squashed 'contrib/relic/' changes from 1885ae3b..e6209fd8
6e619c55f1 Merge PIVX-Project/bls-signatures#16: [GA] Bump action-apt to `master` version
765a72b5cd Merge PIVX-Project/bls-signatures#15: [Build] Add syslib memory include to threshold.cpp
82995ba8be Merge PIVX-Project/bls-signatures#14: [Contrib] Update catch to v2.13.10
b7b5e2bde9 Update Relic git-tag
551f2c4e1d [GA] Bump action-apt to `master` version
0c8c9cd84e [Build] Add syslib memory include to threshold.cpp
c3f7315c28 scripted-diff: Update catch to v2.13.10

git-subtree-dir: src/chiabls
git-subtree-split: 5c0be19abcd3061bb696f236f2c8b6698ca925d5

.github/workflows/build-autotools.yml

@@ -42,6 +42,14 @@ jobs:
             arch_packages: libgmp-dev libsodium-dev
             unit_tests: true
 
+          - name: x86_64 Linux-latest
+            os: ubuntu-latest
+            host: x86_64-unknown-linux-gnu
+            arch: armhf # dummy arch
+            apt_get: gcc-multilib g++-multilib
+            arch_packages: libgmp-dev libsodium-dev
+            unit_tests: true
+
           - name: x86_64 MacOS
             os: macos-11
             host: x86_64-apple-darwin20.6.0
@@ -50,13 +58,21 @@ jobs:
             cxx: clang++
             unit_tests: true
 
+          - name: x86_64 MacOS-latest
+            os: macos-latest
+            host: x86_64-apple-darwin20.6.0
+            brew_install: autoconf automake libtool gmp libsodium
+            cc: clang
+            cxx: clang++
+            unit_tests: true
+
     steps:
       - name: Get Source
         uses: actions/checkout@v3
 
       - name: Setup Arches
         if: matrix.config.arch
-        uses: ryankurte/action-apt@v0.3.0
+        uses: ryankurte/action-apt@master
         with:
           arch: ${{ matrix.config.arch }}
           packages: ${{ matrix.config.arch_packages }}

.github/workflows/build-test.yaml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, ubuntu-20.04]
+        os: [macos-11, macos-latest, ubuntu-20.04, ubuntu-latest]
 
     steps:
     - name: Cancel previous runs on the same branch

CMakeLists.txt

@@ -8,8 +8,8 @@ ENDIF()
 
 project(BLS)
 
-set(BUILD_BLS_TESTS 1 CACHE INTEGER "")
-set(BUILD_BLS_BENCHMARKS 1 CACHE INTEGER "")
+set(BUILD_BLS_TESTS "1" CACHE STRING "")
+set(BUILD_BLS_BENCHMARKS "1" CACHE STRING "")
 
 message(STATUS "Build tests: ${BUILD_BLS_TESTS}")
 message(STATUS "Build benchmarks: ${BUILD_BLS_BENCHMARKS}")
@@ -41,9 +41,9 @@ 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 INTEGER "")
+  set(WSIZE "32" CACHE STRING "Relic - Processor word size")
 else()
-  set(WSIZE 64 CACHE INTEGER "")
+  set(WSIZE "64" CACHE STRING "Relic - Processor word size")
 endif()
 
 set(TIMER "CYCLE" CACHE STRING "")
@@ -54,7 +54,7 @@ set(SHLIB "OFF" CACHE STRING "")
 set(MULTI "PTHREAD" CACHE STRING "")
 set(DOCUM "off" CACHE STRING "")
 
-set(FP_PRIME 381 CACHE INTEGER "")
+set(FP_PRIME "381" CACHE STRING "Relic - Prime modulus size")
 
 IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(SEED "UDEV" CACHE STRING "")
@@ -75,9 +75,9 @@ 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 INTEGER "")
-set(BENCH 0 CACHE INTEGER "")
-set(QUIET 1 CACHE INTEGER "")
+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 "")

Makefile.am

@@ -176,7 +176,20 @@ EPX_SRCS = \
   contrib/relic/src/epx/relic_ep2_neg.c \
   contrib/relic/src/epx/relic_ep2_norm.c \
   contrib/relic/src/epx/relic_ep2_pck.c \
-  contrib/relic/src/epx/relic_ep2_util.c
+  contrib/relic/src/epx/relic_ep2_util.c \
+  contrib/relic/src/epx/relic_ep4_add.c \
+  contrib/relic/src/epx/relic_ep4_cmp.c \
+  contrib/relic/src/epx/relic_ep4_curve.c \
+  contrib/relic/src/epx/relic_ep4_dbl.c \
+  contrib/relic/src/epx/relic_ep4_frb.c \
+  contrib/relic/src/epx/relic_ep4_map.c \
+  contrib/relic/src/epx/relic_ep4_mul.c \
+  contrib/relic/src/epx/relic_ep4_mul_cof.c \
+  contrib/relic/src/epx/relic_ep4_mul_fix.c \
+  contrib/relic/src/epx/relic_ep4_mul_sim.c \
+  contrib/relic/src/epx/relic_ep4_neg.c \
+  contrib/relic/src/epx/relic_ep4_norm.c \
+  contrib/relic/src/epx/relic_ep4_util.c
 
 EB_SRCS = \
   contrib/relic/src/eb/relic_eb_add.c \
@@ -232,7 +245,11 @@ PP_SRCS = \
   contrib/relic/src/pp/relic_pp_map_k12.c \
   contrib/relic/src/pp/relic_pp_map_k48.c \
   contrib/relic/src/pp/relic_pp_map_k54.c \
-  contrib/relic/src/pp/relic_pp_norm.c
+  contrib/relic/src/pp/relic_pp_norm.c \
+  contrib/relic/src/pp/relic_pp_add_k24.c \
+  contrib/relic/src/pp/relic_pp_dbl_k24.c \
+  contrib/relic/src/pp/relic_pp_exp_k24.c \
+  contrib/relic/src/pp/relic_pp_map_k24.c
 
 PC_SRCS = \
   contrib/relic/src/pc/relic_pc_core.c \
@@ -368,6 +385,11 @@ RELIC_SRCS += contrib/relic/src/cp/relic_cp_bbs.c
 RELIC_SRCS += contrib/relic/src/cp/relic_cp_zss.c
 RELIC_SRCS += contrib/relic/src/cp/relic_cp_cmlhs.c
 RELIC_SRCS += contrib/relic/src/cp/relic_cp_mklhs.c
+RELIC_SRCS += contrib/relic/src/cp/relic_cp_ers.c
+RELIC_SRCS += contrib/relic/src/cp/relic_cp_etrs.c
+RELIC_SRCS += contrib/relic/src/cp/relic_cp_pcdel.c
+RELIC_SRCS += contrib/relic/src/cp/relic_cp_pok.c
+RELIC_SRCS += contrib/relic/src/cp/relic_cp_sok.c
 endif
 
 if WITH_BC