Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix support to latest version of RELIC #207

Merged
merged 6 commits into from
Jun 10, 2021
Merged

Fix support to latest version of RELIC #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c6f07e
Update to RELIC's change from COMP to CFLAGS.
dfaranha Mar 17, 2021
54f062b
Rename RELIC master branch to main.
dfaranha Apr 21, 2021
c76e39b
Remove RELIC include that creates conflicts with TEST_CASE macro.
dfaranha Apr 21, 2021
6cf5da3
Remove bn_init from private_key.cpp because AUTO is enforced in the b…
dfaranha Apr 21, 2021
6c201cc
Fix the BN size.
dfaranha Apr 21, 2021
49c302e
Update Readme to force CI rerun
hoffmang9 Jun 10, 2021
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ ENDIF()
set(STBIN "OFF" CACHE STRING "")

set(FP_METHD "INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" CACHE STRING "")
set(COMP "-O3 -funroll-loops -fomit-frame-pointer" CACHE STRING "")
set(CFLAGS "-O3 -funroll-loops -fomit-frame-pointer" CACHE STRING "")
set(FP_PMERS "off" CACHE STRING "")
set(FPX_METHD "INTEG;INTEG;LAZYR" CACHE STRING "")
set(EP_PLAIN "off" CACHE STRING "")
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Features:
* 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) (currently out of date - a great first issue!)
* [JavaScript bindings](https://github.com/Chia-Network/bls-signatures/tree/main/js-bindings)

## Before you start

Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ set (CMAKE_CXX_STANDARD 17)
# CMake 3.14+
include(FetchContent)

if (DEFINED ENV{RELIC_MASTER})
set(RELIC_GIT_TAG "origin/master")
if (DEFINED ENV{RELIC_MAIN})
set(RELIC_GIT_TAG "origin/main")
else ()
set(RELIC_GIT_TAG "03a7c3b7fa43c0da6f3720e341f7d4f6a6d6f21e")
endif ()
Expand Down
2 changes: 1 addition & 1 deletion src/privatekey.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ void PrivateKey::AllocateKeyData()
{
assert(!keydata);
keydata = Util::SecAlloc<bn_st>(1);
bn_init(keydata, RLC_BN_SIZE);
keydata->alloc = RLC_BN_SIZE;
bn_zero(keydata);
}

Expand Down
1 change: 0 additions & 1 deletion src/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
extern "C" {
#include "relic.h"
}
#include "relic_test.h"
#include "test-utils.hpp"
using std::cout;
using std::endl;
Expand Down