diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-12-27 18:09:45 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | 37e5d4b0f6a3ab072a8d41e3414048f8546df237 (patch) | |
| tree | e82d56695342c68551cc08270adeafa60d52814a | |
| parent | 8f3103d6421101bdf418decaa708d758eb663341 (diff) | |
| download | dexon-37e5d4b0f6a3ab072a8d41e3414048f8546df237.tar dexon-37e5d4b0f6a3ab072a8d41e3414048f8546df237.tar.gz dexon-37e5d4b0f6a3ab072a8d41e3414048f8546df237.tar.bz2 dexon-37e5d4b0f6a3ab072a8d41e3414048f8546df237.tar.lz dexon-37e5d4b0f6a3ab072a8d41e3414048f8546df237.tar.xz dexon-37e5d4b0f6a3ab072a8d41e3414048f8546df237.tar.zst dexon-37e5d4b0f6a3ab072a8d41e3414048f8546df237.zip | |
vendor: sync dexon-foundation/bls to latest dev (#108)
| -rw-r--r-- | vendor/github.com/dexon-foundation/bls/Makefile | 26 | ||||
| -rw-r--r-- | vendor/github.com/dexon-foundation/bls/ffi/go/bls/bls.go | 4 | ||||
| -rw-r--r-- | vendor/github.com/dexon-foundation/bls/readme.md | 6 | ||||
| -rw-r--r-- | vendor/vendor.json | 6 |
4 files changed, 10 insertions, 32 deletions
diff --git a/vendor/github.com/dexon-foundation/bls/Makefile b/vendor/github.com/dexon-foundation/bls/Makefile index 8ce73a5a1..556f625ec 100644 --- a/vendor/github.com/dexon-foundation/bls/Makefile +++ b/vendor/github.com/dexon-foundation/bls/Makefile @@ -32,34 +32,10 @@ MCL_LIB=../mcl/lib/libmcl.a $(MCL_LIB): $(MAKE) -C ../mcl lib/libmcl.a -ifeq ($(DOCKER),alpine) -GMP_PREFIX=/usr/lib -OPENSSL_PREFIX=/usr/lib -else ifeq ($(OS),mac) -GMP_PREFIX=$(shell brew --prefix gmp)/lib -OPENSSL_PREFIX=$(shell brew --prefix openssl)/lib -else -GMP_PREFIX=/usr/lib/x86_64-linux-gnu -OPENSSL_PREFIX=/usr/lib/x86_64-linux-gnu -endif - -GMP_STATIC_LIB=$(GMP_PREFIX)/libgmp.a -GMPXX_STATIC_LIB=$(GMP_PREFIX)/libgmpxx.a - -OPENSSL_STATIC_LIB=$(OPENSSL_PREFIX)/libcrypto.a - $(BLS256_LIB): $(OBJ_DIR)/bls_c256.o $(AR) $@ $< $(BLS384_LIB): $(OBJ_DIR)/bls_c384.o $(MCL_LIB) - rm -rf tmp - mkdir -p tmp - cd tmp && \ - ar x ../$(MCL_LIB) && \ - ar x $(OPENSSL_STATIC_LIB) && \ - ar x $(GMP_STATIC_LIB) && \ - ar x $(GMPXX_STATIC_LIB) - $(AR) $@ $< tmp/*.o - rm -rf tmp + $(AR) $@ $< ifneq ($(findstring $(OS),mac/mingw64),) BLS256_SLIB_LDFLAGS+=-lgmpxx -lgmp -lcrypto -lstdc++ diff --git a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/bls.go b/vendor/github.com/dexon-foundation/bls/ffi/go/bls/bls.go index b6ffe49d0..5123a07e6 100644 --- a/vendor/github.com/dexon-foundation/bls/ffi/go/bls/bls.go +++ b/vendor/github.com/dexon-foundation/bls/ffi/go/bls/bls.go @@ -2,8 +2,10 @@ package bls /* #cgo CFLAGS:-I../../../include -I../../../../mcl/include/ -#cgo LDFLAGS:${SRCDIR}/../../../lib/libbls384.a -lstdc++ +#cgo LDFLAGS:${SRCDIR}/../../../lib/libbls384.a ${SRCDIR}/../../../../mcl/lib/libmcl.a -lgmpxx -lgmp -lstdc++ #cgo CFLAGS:-DMCLBN_FP_UNIT_SIZE=6 +#cgo pkg-config: libcrypto +#cgo static pkg-config: --static #include <bls/bls.h> */ import "C" diff --git a/vendor/github.com/dexon-foundation/bls/readme.md b/vendor/github.com/dexon-foundation/bls/readme.md index 544fee3ca..08aac6ca1 100644 --- a/vendor/github.com/dexon-foundation/bls/readme.md +++ b/vendor/github.com/dexon-foundation/bls/readme.md @@ -1,4 +1,4 @@ -[](https://travis-ci.com/Spiderpowa/bls) +[](https://travis-ci.com/dexon-foundation/bls) # BLS threshold signature @@ -10,8 +10,8 @@ Create a working directory (e.g., work) and clone the following repositories. ``` mkdir work cd work -git clone git://github.com/herumi/mcl.git -git clone git://github.com/herumi/bls.git +git clone git://github.com/dexon-foundation/mcl.git +git clone git://github.com/dexon-foundation/bls.git git clone git://github.com/herumi/cybozulib_ext ; for only Windows ``` diff --git a/vendor/vendor.json b/vendor/vendor.json index 945cba99e..f6aeac022 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -95,10 +95,10 @@ "versionExact": "dev" }, { - "checksumSHA1": "5H1BDbKtRXIaO+PzeeiBTJCUm+o=", + "checksumSHA1": "yPWDIKToXWyTkkq3ZU8M461UFJI=", "path": "github.com/dexon-foundation/bls/ffi/go/bls", - "revision": "1208495d2fd3e5a69edaf7f429607e7ef431a5dd", - "revisionTime": "2018-10-23T02:11:18Z", + "revision": "dda43effd59cb08b3e99198c6d066a723e10a86b", + "revisionTime": "2018-12-27T09:54:38Z", "version": "dev", "versionExact": "dev" }, |