aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMITSUNARI Shigeo <herumi@nifty.com>2017-04-02 10:24:33 +0800
committerMITSUNARI Shigeo <herumi@nifty.com>2017-04-02 10:24:33 +0800
commitcd6a2da083dfe28a814a915bf269c01279b4ac92 (patch)
treebd42ec2ace5963da128a141b178285919698dd79
parent1ddd6b9e97d6ab27e2472165066e7ce4ef81e255 (diff)
downloaddexon-bls-cd6a2da083dfe28a814a915bf269c01279b4ac92.tar
dexon-bls-cd6a2da083dfe28a814a915bf269c01279b4ac92.tar.gz
dexon-bls-cd6a2da083dfe28a814a915bf269c01279b4ac92.tar.bz2
dexon-bls-cd6a2da083dfe28a814a915bf269c01279b4ac92.tar.lz
dexon-bls-cd6a2da083dfe28a814a915bf269c01279b4ac92.tar.xz
dexon-bls-cd6a2da083dfe28a814a915bf269c01279b4ac92.tar.zst
dexon-bls-cd6a2da083dfe28a814a915bf269c01279b4ac92.zip
default UNIT is 6
-rw-r--r--.travis.yml6
-rw-r--r--Makefile2
-rw-r--r--go/blscgo/bls.go6
-rw-r--r--readme.md2
4 files changed, 7 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 0569d82..fe05a98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,6 @@ script:
- git clone https://github.com/herumi/mcl.git
- git clone https://github.com/herumi/bls.git
- cd bls
- - make UNIT=4 test
- - make UNIT=4 run_go
+ - make UNIT=4 test run_go
- make clean
- - make UNIT=6 test
- - make UNIT=6 run_go
+ - make UNIT=6 test run_go
diff --git a/Makefile b/Makefile
index 18089b2..7a6335d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ TEST_SRC=bls_test.cpp bls_if_test.cpp
SAMPLE_SRC=bls_smpl.cpp bls_tool.cpp
CFLAGS+=-I../mcl/include
-UNIT?=4
+UNIT?=6
ifeq ($(UNIT),4)
CFLAGS+=-DBLS_MAX_OP_UNIT_SIZE=4
GO_TAG=bn256
diff --git a/go/blscgo/bls.go b/go/blscgo/bls.go
index 35cf253..170146c 100644
--- a/go/blscgo/bls.go
+++ b/go/blscgo/bls.go
@@ -1,9 +1,9 @@
package blscgo
/*
-#cgo CFLAGS:-I../../include
-#cgo bn256 CFLAGS:-DBLS_MAX_OP_UNIT_SIZE=4
-#cgo bn384 CFLAGS:-DBLS_MAX_OP_UNIT_SIZE=6
+#cgo CFLAGS:-I../../include -DBLS_MAX_OP_UNIT_SIZE=6
+#cgo bn256 CFLAGS:-UBLS_MAX_OP_UNIT_SIZE -DBLS_MAX_OP_UNIT_SIZE=4
+#cgo bn384 CFLAGS:-UBLS_MAX_OP_UNIT_SIZE -DBLS_MAX_OP_UNIT_SIZE=6
#cgo LDFLAGS:-lbls -lbls_if -lmcl -lgmp -lgmpxx -L../lib -L../../lib -L../../../mcl/lib -L../../mcl/lib -lstdc++ -lcrypto
#include "bls_if.h"
*/
diff --git a/readme.md b/readme.md
index b199678..5e7337d 100644
--- a/readme.md
+++ b/readme.md
@@ -18,7 +18,7 @@ git clone git://github.com/herumi/cybozulib_ext ; for only Windows
```
# Build and test for Linux
-Specifiy UNIT=4 or 6 always to make.
+Specifiy UNIT=4 or 6 always to make. Default UNIT is 6.
To make lib/libbls.a and test, run
```
cd bls