aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMITSUNARI Shigeo <herumi@nifty.com>2018-05-15 04:34:40 +0800
committerMITSUNARI Shigeo <herumi@nifty.com>2018-05-15 04:34:40 +0800
commitd7555b3366b3161aee219343d0f4fe94087f239b (patch)
treee2c9bf3a0b59a6c74e34591ae5d843cba02fc599
parentbe595c0f9471779a72ef964ce7a13dc66322020b (diff)
downloaddexon-bls-d7555b3366b3161aee219343d0f4fe94087f239b.tar
dexon-bls-d7555b3366b3161aee219343d0f4fe94087f239b.tar.gz
dexon-bls-d7555b3366b3161aee219343d0f4fe94087f239b.tar.bz2
dexon-bls-d7555b3366b3161aee219343d0f4fe94087f239b.tar.lz
dexon-bls-d7555b3366b3161aee219343d0f4fe94087f239b.tar.xz
dexon-bls-d7555b3366b3161aee219343d0f4fe94087f239b.tar.zst
dexon-bls-d7555b3366b3161aee219343d0f4fe94087f239b.zip
fix SetHashOf
-rw-r--r--Makefile4
-rw-r--r--ffi/go/bls/mcl.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 079f353..e0dd399 100644
--- a/Makefile
+++ b/Makefile
@@ -87,11 +87,11 @@ test_go: ffi/go/bls/bls.go ffi/go/bls/bls_test.go $(BLS384_SLIB)
EMCC_OPT=-I./include -I./src -I../cybozulib/include -I../mcl/include -I./
EMCC_OPT+=-O3 -DNDEBUG -DMCLBN_FP_UNIT_SIZE=6 -DMCL_MAX_BIT_SIZE=384 -Os
-EMCC_OPT+=-s WASM=1 -s DISABLE_EXCEPTION_CATCHING=0 -s NO_EXIT_RUNTIME=1
+EMCC_OPT+=-s WASM=1 -s DISABLE_EXCEPTION_CATCHING=0 -s NO_EXIT_RUNTIME=1 -s MODULARIZE=1
JS_DEP=src/bls_c.cpp ../mcl/src/fp.cpp Makefile
../bls-wasm/bls_c.js: $(JS_DEP)
- emcc -o $@ src/bls_c.cpp ../mcl/src/fp.cpp $(EMCC_OPT) -s "MODULARIZE=1"
+ emcc -o $@ src/bls_c.cpp ../mcl/src/fp.cpp $(EMCC_OPT) -DCYBOZU_MINIMUM_EXCEPTION
bls-wasm:
$(MAKE) ../bls-wasm/bls_c.js
diff --git a/ffi/go/bls/mcl.go b/ffi/go/bls/mcl.go
index 00feebc..713a8cc 100644
--- a/ffi/go/bls/mcl.go
+++ b/ffi/go/bls/mcl.go
@@ -135,7 +135,7 @@ func (x *Fr) SetByCSPRNG() {
// SetHashOf --
func (x *Fr) SetHashOf(buf []byte) bool {
// #nosec
- return C.mclBnFr_setHashOf(x.getPointer(), unsafe.Pointer(&buf[0]), C.size_t(len(buf))) == 1
+ return C.mclBnFr_setHashOf(x.getPointer(), unsafe.Pointer(&buf[0]), C.size_t(len(buf))) == 0
}
// GetString --