Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
311 changes: 155 additions & 156 deletions configure.ac

Large diffs are not rendered by default.

48 changes: 48 additions & 0 deletions contrib/relic/.github/workflows/16bit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
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 .
97 changes: 97 additions & 0 deletions contrib/relic/.github/workflows/32bit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
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 .
48 changes: 48 additions & 0 deletions contrib/relic/.github/workflows/8bit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
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 .
91 changes: 91 additions & 0 deletions contrib/relic/.github/workflows/bls12-381.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
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 .
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: Continuous Integration
name: Basic configuration

on: [push, pull_request]
on:
push:
branches:
- '**' # all branches
pull_request:
branches:
- '**' # all branches

jobs:
build:
Expand Down Expand Up @@ -42,10 +48,6 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Install Linux Dependencies
if: runner.os == 'Linux'
run: sudo apt install libgmp-dev

- name: Set Windows enviroment
if: ${{ (runner.os == 'Windows') && (matrix.config.cc == 'cl') }}
uses: ilammy/msvc-dev-cmd@v1
Expand Down
Loading