From 5a38c2e8c9a27555229e9cd61455caf1aa3d8907 Mon Sep 17 00:00:00 2001 From: MITSUNARI Shigeo Date: Sun, 4 Jun 2017 06:55:43 +0900 Subject: rename bls_if.h to bls.h --- Makefile | 28 ++--- go/bls/bls.go | 20 ++-- include/bls/bls.h | 16 +-- include/bls/bls.hpp | 16 +-- src/bls.cpp | 10 +- src/bls_c.cpp | 320 +++++++++++++++++++++++++++++++++++++++++++++++++ src/bls_if.cpp | 320 ------------------------------------------------- test/bls_c384_test.cpp | 91 ++++++++++++++ test/bls_if_test.cpp | 91 -------------- test/bls_test.cpp | 2 +- 10 files changed, 457 insertions(+), 457 deletions(-) create mode 100644 src/bls_c.cpp delete mode 100644 src/bls_if.cpp create mode 100644 test/bls_c384_test.cpp delete mode 100644 test/bls_if_test.cpp diff --git a/Makefile b/Makefile index 3ae7afc..6aa5927 100644 --- a/Makefile +++ b/Makefile @@ -4,18 +4,18 @@ OBJ_DIR=obj EXE_DIR=bin CFLAGS += -std=c++11 -SRC_SRC=bls.cpp bls_if.cpp -TEST_SRC=bls_test.cpp bls_if_test.cpp +SRC_SRC=bls.cpp bls_c.cpp +TEST_SRC=bls_test.cpp bls_c384_test.cpp SAMPLE_SRC=bls_smpl.cpp bls_tool.cpp CFLAGS+=-I../mcl/include UNIT?=6 ifeq ($(UNIT),4) - CFLAGS+=-DBLS_MAX_OP_UNIT_SIZE=4 + CFLAGS+=-DBLS_FP_UNIT_SIZE=4 GO_TAG=bn256 endif ifeq ($(UNIT),6) - CFLAGS+=-DBLS_MAX_OP_UNIT_SIZE=6 + CFLAGS+=-DBLS_FP_UNIT_SIZE=6 GO_TAG=bn384 endif @@ -37,11 +37,11 @@ $(MCL_LIB): ################################################################## -BLS_IF_LIB=$(LIB_DIR)/libbls_if.a -lib: $(BLS_LIB) $(BLS_IF_LIB) +BLS384_LIB=$(LIB_DIR)/libbls384.a +lib: $(BLS_LIB) $(BLS384_LIB) -$(BLS_IF_LIB): $(LIB_OBJ) $(OBJ_DIR)/bls_if.o - $(AR) $@ $(LIB_OBJ) $(OBJ_DIR)/bls_if.o +$(BLS384_LIB): $(LIB_OBJ) $(OBJ_DIR)/bls_c384.o + $(AR) $@ $(LIB_OBJ) $(OBJ_DIR)/bls_c384.o VPATH=test sample src @@ -50,11 +50,11 @@ VPATH=test sample src $(OBJ_DIR)/%.o: %.cpp $(PRE)$(CXX) $(CFLAGS) -c $< -o $@ -MMD -MP -MF $(@:.o=.d) -$(EXE_DIR)/%.exe: $(OBJ_DIR)/%.o $(BLS_LIB) $(MCL_LIB) - $(PRE)$(CXX) $< -o $@ $(BLS_LIB) -lmcl -L../mcl/lib $(LDFLAGS) +$(OBJ_DIR)/bls_c384.o: bls_c.cpp + $(PRE)$(CXX) $(CFLAGS) -c $< -o $@ -MMD -MP -MF $(@:.o=.d) -DBLS_FP_UNIT_SIZE=6 -$(EXE_DIR)/bls_if_test.exe: $(OBJ_DIR)/bls_if_test.o $(BLS_LIB) $(MCL_LIB) $(BLS_IF_LIB) - $(PRE)$(CXX) $< -o $@ $(BLS_LIB) $(BLS_IF_LIB) -lmcl -L../mcl/lib $(LDFLAGS) +$(EXE_DIR)/%.exe: $(OBJ_DIR)/%.o $(BLS_LIB) $(BLS384_LIB) $(MCL_LIB) + $(PRE)$(CXX) $< -o $@ $(BLS_LIB) $(BLS384_LIB) -lmcl -L../mcl/lib $(LDFLAGS) SAMPLE_EXE=$(addprefix $(EXE_DIR)/,$(SAMPLE_SRC:.cpp=.exe)) sample: $(SAMPLE_EXE) $(BLS_LIB) @@ -65,13 +65,13 @@ test: $(TEST_EXE) @sh -ec 'for i in $(TEST_EXE); do $$i|grep "ctest:name"; done' > result.txt @grep -v "ng=0, exception=0" result.txt; if [ $$? -eq 1 ]; then echo "all unit tests succeed"; else exit 1; fi -run_go: go/bls/bls.go go/bls/bls_test.go $(BLS_LIB) $(BLS_IF_LIB) +run_go: go/bls/bls.go go/bls/bls_test.go $(BLS_LIB) $(BLS384_LIB) # cd go/bls && env PKG_CONFIG_PATH=./ go test -tags $(GO_TAG) . cd go/bls && go test -tags $(GO_TAG) . # cd go/bls && go test -tags $(GO_TAG) -v . clean: - $(RM) $(BLS_LIB) $(OBJ_DIR)/*.d $(OBJ_DIR)/*.o $(EXE_DIR)/*.exe $(GEN_EXE) $(ASM_SRC) $(ASM_OBJ) $(LIB_OBJ) $(LLVM_SRC) $(BLS_IF_LIB) + $(RM) $(BLS_LIB) $(OBJ_DIR)/*.d $(OBJ_DIR)/*.o $(EXE_DIR)/*.exe $(GEN_EXE) $(ASM_SRC) $(ASM_OBJ) $(LIB_OBJ) $(LLVM_SRC) $(BLS384_LIB) ALL_SRC=$(SRC_SRC) $(TEST_SRC) $(SAMPLE_SRC) DEPEND_FILE=$(addprefix $(OBJ_DIR)/, $(ALL_SRC:.cpp=.d)) diff --git a/go/bls/bls.go b/go/bls/bls.go index 8c34d7e..bbf765d 100644 --- a/go/bls/bls.go +++ b/go/bls/bls.go @@ -2,10 +2,10 @@ package bls /* #cgo CFLAGS:-I../../include -#cgo LDFLAGS:-lbls_if -lbls -lmcl -lgmpxx -lstdc++ -lgmp -lcrypto -L../../lib -L../../../mcl/lib -#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 -#include +#cgo LDFLAGS:-lbls384 -lmcl -lgmpxx -lstdc++ -lgmp -lcrypto -L../../lib -L../../../mcl/lib +#cgo bn256 CFLAGS:-UBLS_FP_UNIT_SIZE -DBLS_FP_UNIT_SIZE=4 +#cgo bn384 CFLAGS:-UBLS_FP_UNIT_SIZE -DBLS_FP_UNIT_SIZE=6 +#include */ import "C" import "fmt" @@ -24,7 +24,7 @@ const CurveFp382_2 = 2 // call this function before calling all the other operations // this function is not thread safe func Init(curve int) error { - err := C.blsInit(C.int(curve), C.BLS_MAX_OP_UNIT_SIZE) + err := C.blsInit(C.int(curve), C.BLS_FP_UNIT_SIZE) if err != 0 { return fmt.Errorf("ERR Init curve=%d", curve) } @@ -33,7 +33,7 @@ func Init(curve int) error { // GetMaxOpUnitSize -- func GetMaxOpUnitSize() int { - return int(C.BLS_MAX_OP_UNIT_SIZE) + return int(C.BLS_FP_UNIT_SIZE) } // GetOpUnitSize -- @@ -65,7 +65,7 @@ func GetFieldOrder() string { // ID -- type ID struct { - v [C.BLS_MAX_OP_UNIT_SIZE]C.uint64_t + v [C.BLS_FP_UNIT_SIZE]C.uint64_t } // getPointer -- @@ -146,7 +146,7 @@ func (id *ID) IsEqual(rhs *ID) bool { // SecretKey -- type SecretKey struct { - v [C.BLS_MAX_OP_UNIT_SIZE]C.uint64_t + v [C.BLS_FP_UNIT_SIZE]C.uint64_t } // getPointer -- @@ -282,7 +282,7 @@ func (sec *SecretKey) GetPop() (sign *Sign) { // PublicKey -- type PublicKey struct { - v [C.BLS_MAX_OP_UNIT_SIZE * 2 * 3]C.uint64_t + v [C.BLS_FP_UNIT_SIZE * 2 * 3]C.uint64_t } // getPointer -- @@ -364,7 +364,7 @@ func (pub *PublicKey) Recover(pubVec []PublicKey, idVec []ID) error { // Sign -- type Sign struct { - v [C.BLS_MAX_OP_UNIT_SIZE * 3]C.uint64_t + v [C.BLS_FP_UNIT_SIZE * 3]C.uint64_t } // getPointer -- diff --git a/include/bls/bls.h b/include/bls/bls.h index 7a25b54..e762f2e 100644 --- a/include/bls/bls.h +++ b/include/bls/bls.h @@ -6,8 +6,8 @@ @license modified new BSD license http://opensource.org/licenses/BSD-3-Clause */ -#ifndef BLS_MAX_OP_UNIT_SIZE - #error "define BLS_MAX_OP_UNIT_SIZE 4(or 6)" +#ifndef BLS_FP_UNIT_SIZE + #error "define BLS_FP_UNIT_SIZE 4(or 6)" #endif #include // for uint64_t, uint8_t @@ -19,8 +19,8 @@ #else #define BLS_DLL_API __declspec(dllimport) #ifndef BLS_NO_AUTOLINK - #if BLS_MAX_OP_UNIT_SIZE == 4 - #pragma comment(lib, "bls_if256.lib") + #if BLS_FP_UNIT_SIZE == 4 + #pragma comment(lib, "bls256.lib") #endif #endif #endif @@ -39,19 +39,19 @@ enum { }; typedef struct { - uint64_t buf[BLS_MAX_OP_UNIT_SIZE]; + uint64_t buf[BLS_FP_UNIT_SIZE]; } blsId; typedef struct { - uint64_t buf[BLS_MAX_OP_UNIT_SIZE]; + uint64_t buf[BLS_FP_UNIT_SIZE]; } blsSecretKey; typedef struct { - uint64_t buf[BLS_MAX_OP_UNIT_SIZE * 2 * 3]; + uint64_t buf[BLS_FP_UNIT_SIZE * 2 * 3]; } blsPublicKey; typedef struct { - uint64_t buf[BLS_MAX_OP_UNIT_SIZE * 3]; + uint64_t buf[BLS_FP_UNIT_SIZE * 3]; } blsSignature; /* diff --git a/include/bls/bls.hpp b/include/bls/bls.hpp index f3a29a0..382eba7 100644 --- a/include/bls/bls.hpp +++ b/include/bls/bls.hpp @@ -6,8 +6,8 @@ @license modified new BSD license http://opensource.org/licenses/BSD-3-Clause */ -#ifndef BLS_MAX_OP_UNIT_SIZE - #error "define BLS_MAX_OP_UNIT_SIZE 4(or 6)" +#ifndef BLS_FP_UNIT_SIZE + #error "define BLS_FP_UNIT_SIZE 4(or 6)" #endif #include #include @@ -62,7 +62,7 @@ struct Id; @param maxUnitSize [in] 4 or 6 (specify same value used in compiling for validation) @note init() is not thread safe */ -void init(int curve = CurveFp254BNb, int maxUnitSize = BLS_MAX_OP_UNIT_SIZE); +void init(int curve = CurveFp254BNb, int maxUnitSize = BLS_FP_UNIT_SIZE); size_t getOpUnitSize(); void getCurveOrder(std::string& str); void getFieldOrder(std::string& str); @@ -77,7 +77,7 @@ class Id; r = 0x2523648240000001ba344d8000000007ff9f800000000010a10000000000000d sizeof(uint64_t) * keySize byte */ -const size_t keySize = BLS_MAX_OP_UNIT_SIZE; +const size_t keySize = BLS_FP_UNIT_SIZE; typedef std::vector SecretKeyVec; typedef std::vector PublicKeyVec; @@ -85,7 +85,7 @@ typedef std::vector SignatureVec; typedef std::vector IdVec; class Id { - uint64_t self_[BLS_MAX_OP_UNIT_SIZE]; + uint64_t self_[BLS_FP_UNIT_SIZE]; friend class PublicKey; friend class SecretKey; template friend struct WrapArray; @@ -113,7 +113,7 @@ public: s ; secret key */ class SecretKey { - uint64_t self_[BLS_MAX_OP_UNIT_SIZE]; + uint64_t self_[BLS_FP_UNIT_SIZE]; template friend struct WrapArray; impl::SecretKey& getInner() { return *reinterpret_cast(self_); } const impl::SecretKey& getInner() const { return *reinterpret_cast(self_); } @@ -178,7 +178,7 @@ public: sQ ; public key */ class PublicKey { - uint64_t self_[BLS_MAX_OP_UNIT_SIZE * 2 * 3]; + uint64_t self_[BLS_FP_UNIT_SIZE * 2 * 3]; friend class SecretKey; friend class Signature; template friend struct WrapArray; @@ -217,7 +217,7 @@ public: s H(m) ; signature */ class Signature { - uint64_t self_[BLS_MAX_OP_UNIT_SIZE * 3]; + uint64_t self_[BLS_FP_UNIT_SIZE * 3]; friend class SecretKey; template friend struct WrapArray; impl::Signature& getInner() { return *reinterpret_cast(self_); } diff --git a/src/bls.cpp b/src/bls.cpp index 7b6f40b..fb3e404 100644 --- a/src/bls.cpp +++ b/src/bls.cpp @@ -9,14 +9,14 @@ #include #include #include -#if BLS_MAX_OP_UNIT_SIZE == 4 +#if BLS_FP_UNIT_SIZE == 4 #include using namespace mcl::bn256; -#elif BLS_MAX_OP_UNIT_SIZE == 6 +#elif BLS_FP_UNIT_SIZE == 6 #include using namespace mcl::bn384; #else - #error "define BLS_MAX_OP_UNIT_SIZE 4(or 6)" + #error "define BLS_FP_UNIT_SIZE 4(or 6)" #endif typedef std::vector FrVec; @@ -165,13 +165,13 @@ std::ostream& writeAsHex(std::ostream& os, const T& t) void init(int curve, int maxUnitSize) { - if (maxUnitSize != BLS_MAX_OP_UNIT_SIZE) throw cybozu::Exception("bls:init:bad maxUnitSize") << maxUnitSize << BLS_MAX_OP_UNIT_SIZE; + if (maxUnitSize != BLS_FP_UNIT_SIZE) throw cybozu::Exception("bls:init:bad maxUnitSize") << maxUnitSize << BLS_FP_UNIT_SIZE; mcl::bn::CurveParam cp; switch (curve) { case bls::CurveFp254BNb: cp = mcl::bn::CurveFp254BNb; break; -#if BLS_MAX_OP_UNIT_SIZE == 6 +#if BLS_FP_UNIT_SIZE == 6 case bls::CurveFp382_1: cp = mcl::bn::CurveFp382_1; break; diff --git a/src/bls_c.cpp b/src/bls_c.cpp new file mode 100644 index 0000000..959d788 --- /dev/null +++ b/src/bls_c.cpp @@ -0,0 +1,320 @@ +#include "bls/bls.hpp" +#define BLS_DLL_EXPORT +#include "bls/bls.h" +#include +#include +#include +#include + +template +int setStrT(Outer *p, const char *buf, size_t bufSize, int ioMode) + try +{ + ((Inner*)p)->setStr(std::string(buf, bufSize), ioMode); + return 0; +} catch (std::exception& e) { + fprintf(stderr, "err setStrT %s\n", e.what()); + return -1; +} + +size_t checkAndCopy(char *buf, size_t maxBufSize, const std::string& s) +{ + if (s.size() > maxBufSize + 1) { + return 0; + } + memcpy(buf, s.c_str(), s.size()); + buf[s.size()] = '\0'; + return s.size(); +} +template +size_t getStrT(const Outer *p, char *buf, size_t maxBufSize, int ioMode) + try +{ + std::string s; + ((const Inner*)p)->getStr(s, ioMode); + size_t terminate = 0; + if (ioMode == 0 || ioMode == bls::IoBin || ioMode == bls::IoDec || ioMode == bls::IoHex) { + terminate = 1; // for '\0' + } + if (s.size() > maxBufSize + terminate) { + return 0; + } + memcpy(buf, s.c_str(), s.size()); + if (terminate) { + buf[s.size()] = '\0'; + } + return s.size(); +} catch (std::exception&) { + return 0; +} + +int blsInit(int curve, int maxUnitSize) + try +{ + bls::init(curve, maxUnitSize); + return 0; +} catch (std::exception&) { + return -1; +} +size_t blsGetOpUnitSize() +{ + return bls::getOpUnitSize(); +} + +int blsGetCurveOrder(char *buf, size_t maxBufSize) + try +{ + std::string s; + bls::getCurveOrder(s); + return (int)checkAndCopy(buf, maxBufSize, s); +} catch (std::exception&) { + return 0; +} + +int blsGetFieldOrder(char *buf, size_t maxBufSize) + try +{ + std::string s; + bls::getFieldOrder(s); + return (int)checkAndCopy(buf, maxBufSize, s); +} catch (std::exception&) { + return 0; +} + +int blsIdIsEqual(const blsId *lhs, const blsId *rhs) +{ + return *(const bls::Id*)lhs == *(const bls::Id*)rhs ? 1 : 0; +} +int blsIdSetLittleEndian(blsId *id, const void *buf, size_t bufSize) +{ + ((bls::Id*)id)->setLittleEndian(buf, bufSize); + return 0; +} +int blsIdSetDecStr(blsId *id, const char *buf, size_t bufSize) +{ + return setStrT(id, buf, bufSize, 10); +} +int blsIdSetHexStr(blsId *id, const char *buf, size_t bufSize) +{ + return setStrT(id, buf, bufSize, 16); +} +size_t blsIdGetLittleEndian(void *buf, size_t maxBufSize, const blsId *id) +{ + return getStrT(id, (char *)buf, maxBufSize, bls::IoFixedByteSeq); +} +size_t blsIdGetDecStr(char *buf, size_t maxBufSize, const blsId *id) +{ + return getStrT(id, buf, maxBufSize, 10); +} +size_t blsIdGetHexStr(char *buf, size_t maxBufSize, const blsId *id) +{ + return getStrT(id, buf, maxBufSize, 16); +} +int blsSecretKeyIsEqual(const blsSecretKey *lhs, const blsSecretKey *rhs) +{ + return *(const bls::SecretKey*)lhs == *(const bls::SecretKey*)rhs ? 1 : 0; +} +int blsSecretKeySetLittleEndian(blsSecretKey *sec, const void *buf, size_t bufSize) +{ + ((bls::SecretKey*)sec)->setLittleEndian(buf, bufSize); + return 0; +} +int blsSecretKeySetDecStr(blsSecretKey *sec, const char *buf, size_t bufSize) +{ + return setStrT(sec, buf, bufSize, 10); +} +int blsSecretKeySetHexStr(blsSecretKey *sec, const char *buf, size_t bufSize) +{ + return setStrT(sec, buf, bufSize, 16); +} +size_t blsSecretKeyGetLittleEndian(void *buf, size_t maxBufSize, const blsSecretKey *sec) +{ + return getStrT(sec, (char *)buf, maxBufSize, bls::IoFixedByteSeq); +} +size_t blsSecretKeyGetDecStr(char *buf, size_t maxBufSize, const blsSecretKey *sec) +{ + return getStrT(sec, buf, maxBufSize, 10); +} +size_t blsSecretKeyGetHexStr(char *buf, size_t maxBufSize, const blsSecretKey *sec) +{ + return getStrT(sec, buf, maxBufSize, 16); +} + +int blsHashToSecretKey(blsSecretKey *sec, const void *buf, size_t bufSize) + try +{ + ((bls::SecretKey*)sec)->setHashOf(buf, bufSize); + return 0; +} catch (std::exception& e) { + fprintf(stderr, "err blsHashToSecretKey %s\n", e.what()); + return -1; +} + +int blsSecretKeySetByCSPRNG(blsSecretKey *sec) + try +{ + ((bls::SecretKey*)sec)->init(); + return 0; +} catch (std::exception& e) { + fprintf(stderr, "err blsSecretKeySetByCSPRNG %s\n", e.what()); + return -1; +} +void blsSecretKeyAdd(blsSecretKey *sec, const blsSecretKey *rhs) +{ + ((bls::SecretKey*)sec)->add(*(const bls::SecretKey*)rhs); +} + +void blsGetPublicKey(blsPublicKey *pub, const blsSecretKey *sec) +{ + ((const bls::SecretKey*)sec)->getPublicKey(*(bls::PublicKey*)pub); +} +void blsSign(blsSignature *sig, const blsSecretKey *sec, const char *m, size_t size) +{ + ((const bls::SecretKey*)sec)->sign(*(bls::Signature*)sig, std::string(m, size)); +} +int blsSecretKeyShare(blsSecretKey *sec, const blsSecretKey* msk, size_t k, const blsId *id) + try +{ + ((bls::SecretKey*)sec)->set((const bls::SecretKey *)msk, k, *(const bls::Id*)id); + return 0; +} catch (std::exception& e) { + fprintf(stderr, "err blsSecretKeyShare %s\n", e.what()); + return -1; +} + +int blsSecretKeyRecover(blsSecretKey *sec, const blsSecretKey *secVec, const blsId *idVec, size_t n) + try +{ + ((bls::SecretKey*)sec)->recover((const bls::SecretKey *)secVec, (const bls::Id *)idVec, n); + return 0; +} catch (std::exception& e) { + fprintf(stderr, "err blsSecretKeyRecover %s\n", e.what()); + return -1; +} + +void blsGetPop(blsSignature *sig, const blsSecretKey *sec) +{ + ((const bls::SecretKey*)sec)->getPop(*(bls::Signature*)sig); +} + +int blsPublicKeyIsEqual(const blsPublicKey *lhs, const blsPublicKey *rhs) +{ + return *(const bls::PublicKey*)lhs == *(const bls::PublicKey*)rhs ? 1 : 0; +} +int blsPublicKeyDeserialize(blsPublicKey *pub, const void *buf, size_t bufSize) +{ + return setStrT(pub, (const char*)buf, bufSize, bls::IoFixedByteSeq); +} +size_t blsPublicKeySerialize(void *buf, size_t maxBufSize, const blsPublicKey *pub) +{ + return getStrT(pub, (char *)buf, maxBufSize, bls::IoFixedByteSeq); +} +int blsPublicKeySetHexStr(blsPublicKey *pub, const char *buf, size_t bufSize) + try +{ + std::string s = mcl::fp::hexStrToLittleEndian(buf, bufSize); + return blsPublicKeyDeserialize(pub, s.c_str(), s.size()); +} catch (std::exception& e) { + fprintf(stderr, "err blsPublicKeySetHexStr %s\n", e.what()); + return -1; +} +size_t blsPublicKeyGetHexStr(char *buf, size_t maxBufSize, const blsPublicKey *pub) +{ + std::string s; + s.resize(1024); + size_t len = blsPublicKeySerialize(&s[0], s.size(), pub); + if (len > 0) { + s.resize(len); + s = mcl::fp::littleEndianToHexStr(s.c_str(), s.size()); + if (s.size() < maxBufSize) { + memcpy(buf, s.c_str(), s.size()); + buf[s.size()] = '\0'; + return s.size(); + } + } + return 0; +} +void blsPublicKeyAdd(blsPublicKey *pub, const blsPublicKey *rhs) +{ + ((bls::PublicKey*)pub)->add(*(const bls::PublicKey*)rhs); +} +int blsPublicKeyShare(blsPublicKey *pub, const blsPublicKey *mpk, size_t k, const blsId *id) + try +{ + ((bls::PublicKey*)pub)->set((const bls::PublicKey*)mpk, k, *(const bls::Id*)id); + return 0; +} catch (std::exception& e) { + fprintf(stderr, "err blsPublicKeyShare %s\n", e.what()); + return -1; +} +int blsPublicKeyRecover(blsPublicKey *pub, const blsPublicKey *pubVec, const blsId *idVec, size_t n) + try +{ + ((bls::PublicKey*)pub)->recover((const bls::PublicKey*)pubVec, (const bls::Id*)idVec, n); + return 0; +} catch (std::exception& e) { + fprintf(stderr, "err blsPublicKeyRecover %s\n", e.what()); + return -1; +} + +int blsSignatureIsEqual(const blsSignature *lhs, const blsSignature *rhs) +{ + return *(const bls::Signature*)lhs == *(const bls::Signature*)rhs ? 1 : 0; +} +int blsSignatureDeserialize(blsSignature *sig, const void *buf, size_t bufSize) +{ + return setStrT(sig, (const char *)buf, bufSize, bls::IoFixedByteSeq); +} +int blsSignatureSetHexStr(blsSignature *sig, const char *buf, size_t bufSize) + try +{ + std::string s = mcl::fp::hexStrToLittleEndian(buf, bufSize); + return blsSignatureDeserialize(sig, s.c_str(), s.size()); +} catch (std::exception& e) { + fprintf(stderr, "err blsSignatureSetHexStr %s\n", e.what()); + return -1; +} +size_t blsSignatureGetHexStr(char *buf, size_t maxBufSize, const blsSignature *sig) +{ + std::string s; + s.resize(1024); + size_t len = blsSignatureSerialize(&s[0], s.size(), sig); + if (len > 0) { + s.resize(len); + s = mcl::fp::littleEndianToHexStr(s.c_str(), s.size()); + if (s.size() < maxBufSize) { + memcpy(buf, s.c_str(), s.size()); + buf[s.size()] = '\0'; + return s.size(); + } + } + return 0; +} +size_t blsSignatureSerialize(void *buf, size_t maxBufSize, const blsSignature *sig) +{ + return getStrT(sig, (char *)buf, maxBufSize, bls::IoFixedByteSeq); +} +void blsSignatureAdd(blsSignature *sig, const blsSignature *rhs) +{ + ((bls::Signature*)sig)->add(*(const bls::Signature*)rhs); +} +int blsSignatureRecover(blsSignature *sig, const blsSignature *sigVec, const blsId *idVec, size_t n) + try +{ + ((bls::Signature*)sig)->recover((const bls::Signature*)sigVec, (const bls::Id*)idVec, n); + return 0; +} catch (std::exception& e) { + fprintf(stderr, "err blsSignatureRecover %s\n", e.what()); + return -1; +} + +int blsVerify(const blsSignature *sig, const blsPublicKey *pub, const char *m, size_t size) +{ + return ((const bls::Signature*)sig)->verify(*(const bls::PublicKey*)pub, std::string(m, size)); +} + +int blsVerifyPop(const blsSignature *sig, const blsPublicKey *pub) +{ + return ((const bls::Signature*)sig)->verify(*(const bls::PublicKey*)pub); +} + diff --git a/src/bls_if.cpp b/src/bls_if.cpp deleted file mode 100644 index d32740d..0000000 --- a/src/bls_if.cpp +++ /dev/null @@ -1,320 +0,0 @@ -#include "bls/bls.hpp" -#define BLS_DLL_EXPORT -#include "bls/bls_if.h" -#include -#include -#include -#include - -template -int setStrT(Outer *p, const char *buf, size_t bufSize, int ioMode) - try -{ - ((Inner*)p)->setStr(std::string(buf, bufSize), ioMode); - return 0; -} catch (std::exception& e) { - fprintf(stderr, "err setStrT %s\n", e.what()); - return -1; -} - -size_t checkAndCopy(char *buf, size_t maxBufSize, const std::string& s) -{ - if (s.size() > maxBufSize + 1) { - return 0; - } - memcpy(buf, s.c_str(), s.size()); - buf[s.size()] = '\0'; - return s.size(); -} -template -size_t getStrT(const Outer *p, char *buf, size_t maxBufSize, int ioMode) - try -{ - std::string s; - ((const Inner*)p)->getStr(s, ioMode); - size_t terminate = 0; - if (ioMode == 0 || ioMode == bls::IoBin || ioMode == bls::IoDec || ioMode == bls::IoHex) { - terminate = 1; // for '\0' - } - if (s.size() > maxBufSize + terminate) { - return 0; - } - memcpy(buf, s.c_str(), s.size()); - if (terminate) { - buf[s.size()] = '\0'; - } - return s.size(); -} catch (std::exception&) { - return 0; -} - -int blsInit(int curve, int maxUnitSize) - try -{ - bls::init(curve, maxUnitSize); - return 0; -} catch (std::exception&) { - return -1; -} -size_t blsGetOpUnitSize() -{ - return bls::getOpUnitSize(); -} - -int blsGetCurveOrder(char *buf, size_t maxBufSize) - try -{ - std::string s; - bls::getCurveOrder(s); - return (int)checkAndCopy(buf, maxBufSize, s); -} catch (std::exception&) { - return 0; -} - -int blsGetFieldOrder(char *buf, size_t maxBufSize) - try -{ - std::string s; - bls::getFieldOrder(s); - return (int)checkAndCopy(buf, maxBufSize, s); -} catch (std::exception&) { - return 0; -} - -int blsIdIsEqual(const blsId *lhs, const blsId *rhs) -{ - return *(const bls::Id*)lhs == *(const bls::Id*)rhs ? 1 : 0; -} -int blsIdSetLittleEndian(blsId *id, const void *buf, size_t bufSize) -{ - ((bls::Id*)id)->setLittleEndian(buf, bufSize); - return 0; -} -int blsIdSetDecStr(blsId *id, const char *buf, size_t bufSize) -{ - return setStrT(id, buf, bufSize, 10); -} -int blsIdSetHexStr(blsId *id, const char *buf, size_t bufSize) -{ - return setStrT(id, buf, bufSize, 16); -} -size_t blsIdGetLittleEndian(void *buf, size_t maxBufSize, const blsId *id) -{ - return getStrT(id, (char *)buf, maxBufSize, bls::IoFixedByteSeq); -} -size_t blsIdGetDecStr(char *buf, size_t maxBufSize, const blsId *id) -{ - return getStrT(id, buf, maxBufSize, 10); -} -size_t blsIdGetHexStr(char *buf, size_t maxBufSize, const blsId *id) -{ - return getStrT(id, buf, maxBufSize, 16); -} -int blsSecretKeyIsEqual(const blsSecretKey *lhs, const blsSecretKey *rhs) -{ - return *(const bls::SecretKey*)lhs == *(const bls::SecretKey*)rhs ? 1 : 0; -} -int blsSecretKeySetLittleEndian(blsSecretKey *sec, const void *buf, size_t bufSize) -{ - ((bls::SecretKey*)sec)->setLittleEndian(buf, bufSize); - return 0; -} -int blsSecretKeySetDecStr(blsSecretKey *sec, const char *buf, size_t bufSize) -{ - return setStrT(sec, buf, bufSize, 10); -} -int blsSecretKeySetHexStr(blsSecretKey *sec, const char *buf, size_t bufSize) -{ - return setStrT(sec, buf, bufSize, 16); -} -size_t blsSecretKeyGetLittleEndian(void *buf, size_t maxBufSize, const blsSecretKey *sec) -{ - return getStrT(sec, (char *)buf, maxBufSize, bls::IoFixedByteSeq); -} -size_t blsSecretKeyGetDecStr(char *buf, size_t maxBufSize, const blsSecretKey *sec) -{ - return getStrT(sec, buf, maxBufSize, 10); -} -size_t blsSecretKeyGetHexStr(char *buf, size_t maxBufSize, const blsSecretKey *sec) -{ - return getStrT(sec, buf, maxBufSize, 16); -} - -int blsHashToSecretKey(blsSecretKey *sec, const void *buf, size_t bufSize) - try -{ - ((bls::SecretKey*)sec)->setHashOf(buf, bufSize); - return 0; -} catch (std::exception& e) { - fprintf(stderr, "err blsHashToSecretKey %s\n", e.what()); - return -1; -} - -int blsSecretKeySetByCSPRNG(blsSecretKey *sec) - try -{ - ((bls::SecretKey*)sec)->init(); - return 0; -} catch (std::exception& e) { - fprintf(stderr, "err blsSecretKeySetByCSPRNG %s\n", e.what()); - return -1; -} -void blsSecretKeyAdd(blsSecretKey *sec, const blsSecretKey *rhs) -{ - ((bls::SecretKey*)sec)->add(*(const bls::SecretKey*)rhs); -} - -void blsGetPublicKey(blsPublicKey *pub, const blsSecretKey *sec) -{ - ((const bls::SecretKey*)sec)->getPublicKey(*(bls::PublicKey*)pub); -} -void blsSign(blsSignature *sig, const blsSecretKey *sec, const char *m, size_t size) -{ - ((const bls::SecretKey*)sec)->sign(*(bls::Signature*)sig, std::string(m, size)); -} -int blsSecretKeyShare(blsSecretKey *sec, const blsSecretKey* msk, size_t k, const blsId *id) - try -{ - ((bls::SecretKey*)sec)->set((const bls::SecretKey *)msk, k, *(const bls::Id*)id); - return 0; -} catch (std::exception& e) { - fprintf(stderr, "err blsSecretKeyShare %s\n", e.what()); - return -1; -} - -int blsSecretKeyRecover(blsSecretKey *sec, const blsSecretKey *secVec, const blsId *idVec, size_t n) - try -{ - ((bls::SecretKey*)sec)->recover((const bls::SecretKey *)secVec, (const bls::Id *)idVec, n); - return 0; -} catch (std::exception& e) { - fprintf(stderr, "err blsSecretKeyRecover %s\n", e.what()); - return -1; -} - -void blsGetPop(blsSignature *sig, const blsSecretKey *sec) -{ - ((const bls::SecretKey*)sec)->getPop(*(bls::Signature*)sig); -} - -int blsPublicKeyIsEqual(const blsPublicKey *lhs, const blsPublicKey *rhs) -{ - return *(const bls::PublicKey*)lhs == *(const bls::PublicKey*)rhs ? 1 : 0; -} -int blsPublicKeyDeserialize(blsPublicKey *pub, const void *buf, size_t bufSize) -{ - return setStrT(pub, (const char*)buf, bufSize, bls::IoFixedByteSeq); -} -size_t blsPublicKeySerialize(void *buf, size_t maxBufSize, const blsPublicKey *pub) -{ - return getStrT(pub, (char *)buf, maxBufSize, bls::IoFixedByteSeq); -} -int blsPublicKeySetHexStr(blsPublicKey *pub, const char *buf, size_t bufSize) - try -{ - std::string s = mcl::fp::hexStrToLittleEndian(buf, bufSize); - return blsPublicKeyDeserialize(pub, s.c_str(), s.size()); -} catch (std::exception& e) { - fprintf(stderr, "err blsPublicKeySetHexStr %s\n", e.what()); - return -1; -} -size_t blsPublicKeyGetHexStr(char *buf, size_t maxBufSize, const blsPublicKey *pub) -{ - std::string s; - s.resize(1024); - size_t len = blsPublicKeySerialize(&s[0], s.size(), pub); - if (len > 0) { - s.resize(len); - s = mcl::fp::littleEndianToHexStr(s.c_str(), s.size()); - if (s.size() < maxBufSize) { - memcpy(buf, s.c_str(), s.size()); - buf[s.size()] = '\0'; - return s.size(); - } - } - return 0; -} -void blsPublicKeyAdd(blsPublicKey *pub, const blsPublicKey *rhs) -{ - ((bls::PublicKey*)pub)->add(*(const bls::PublicKey*)rhs); -} -int blsPublicKeyShare(blsPublicKey *pub, const blsPublicKey *mpk, size_t k, const blsId *id) - try -{ - ((bls::PublicKey*)pub)->set((const bls::PublicKey*)mpk, k, *(const bls::Id*)id); - return 0; -} catch (std::exception& e) { - fprintf(stderr, "err blsPublicKeyShare %s\n", e.what()); - return -1; -} -int blsPublicKeyRecover(blsPublicKey *pub, const blsPublicKey *pubVec, const blsId *idVec, size_t n) - try -{ - ((bls::PublicKey*)pub)->recover((const bls::PublicKey*)pubVec, (const bls::Id*)idVec, n); - return 0; -} catch (std::exception& e) { - fprintf(stderr, "err blsPublicKeyRecover %s\n", e.what()); - return -1; -} - -int blsSignatureIsEqual(const blsSignature *lhs, const blsSignature *rhs) -{ - return *(const bls::Signature*)lhs == *(const bls::Signature*)rhs ? 1 : 0; -} -int blsSignatureDeserialize(blsSignature *sig, const void *buf, size_t bufSize) -{ - return setStrT(sig, (const char *)buf, bufSize, bls::IoFixedByteSeq); -} -int blsSignatureSetHexStr(blsSignature *sig, const char *buf, size_t bufSize) - try -{ - std::string s = mcl::fp::hexStrToLittleEndian(buf, bufSize); - return blsSignatureDeserialize(sig, s.c_str(), s.size()); -} catch (std::exception& e) { - fprintf(stderr, "err blsSignatureSetHexStr %s\n", e.what()); - return -1; -} -size_t blsSignatureGetHexStr(char *buf, size_t maxBufSize, const blsSignature *sig) -{ - std::string s; - s.resize(1024); - size_t len = blsSignatureSerialize(&s[0], s.size(), sig); - if (len > 0) { - s.resize(len); - s = mcl::fp::littleEndianToHexStr(s.c_str(), s.size()); - if (s.size() < maxBufSize) { - memcpy(buf, s.c_str(), s.size()); - buf[s.size()] = '\0'; - return s.size(); - } - } - return 0; -} -size_t blsSignatureSerialize(void *buf, size_t maxBufSize, const blsSignature *sig) -{ - return getStrT(sig, (char *)buf, maxBufSize, bls::IoFixedByteSeq); -} -void blsSignatureAdd(blsSignature *sig, const blsSignature *rhs) -{ - ((bls::Signature*)sig)->add(*(const bls::Signature*)rhs); -} -int blsSignatureRecover(blsSignature *sig, const blsSignature *sigVec, const blsId *idVec, size_t n) - try -{ - ((bls::Signature*)sig)->recover((const bls::Signature*)sigVec, (const bls::Id*)idVec, n); - return 0; -} catch (std::exception& e) { - fprintf(stderr, "err blsSignatureRecover %s\n", e.what()); - return -1; -} - -int blsVerify(const blsSignature *sig, const blsPublicKey *pub, const char *m, size_t size) -{ - return ((const bls::Signature*)sig)->verify(*(const bls::PublicKey*)pub, std::string(m, size)); -} - -int blsVerifyPop(const blsSignature *sig, const blsPublicKey *pub) -{ - return ((const bls::Signature*)sig)->verify(*(const bls::PublicKey*)pub); -} - diff --git a/test/bls_c384_test.cpp b/test/bls_c384_test.cpp new file mode 100644 index 0000000..0b30e69 --- /dev/null +++ b/test/bls_c384_test.cpp @@ -0,0 +1,91 @@ +#include +#include +#include + +void bls_use_stackTest() +{ + blsSecretKey sec; + blsPublicKey pub; + blsSignature sig; + const char *msg = "this is a pen"; + const size_t msgSize = strlen(msg); + + blsSecretKeySetByCSPRNG(&sec); + + blsGetPublicKey(&pub, &sec); + + blsSign(&sig, &sec, msg, msgSize); + + CYBOZU_TEST_ASSERT(blsVerify(&sig, &pub, msg, msgSize)); +} + +void blsDataTest() +{ + const char *msg = "test test"; + const size_t msgSize = strlen(msg); + const size_t fpSize = blsGetOpUnitSize() * sizeof(uint64_t); + blsSecretKey sec1, sec2; + blsSecretKeySetByCSPRNG(&sec1); + char buf[1024]; + size_t n; + int ret; + n = blsSecretKeyGetHexStr(buf, sizeof(buf), &sec1); + CYBOZU_TEST_ASSERT(0 < n && n <= fpSize * 2); + ret = blsSecretKeySetHexStr(&sec2, buf, n); + CYBOZU_TEST_EQUAL(ret, 0); + CYBOZU_TEST_ASSERT(blsSecretKeyIsEqual(&sec1, &sec2)); + blsPublicKey pub1, pub2; + blsGetPublicKey(&pub1, &sec1); + n = blsPublicKeySerialize(buf, sizeof(buf), &pub1); + CYBOZU_TEST_EQUAL(n, fpSize * 2); + ret = blsPublicKeyDeserialize(&pub2, buf, n); + CYBOZU_TEST_EQUAL(ret, 0); + CYBOZU_TEST_ASSERT(blsPublicKeyIsEqual(&pub1, &pub2)); + blsSignature sig1, sig2; + blsSign(&sig1, &sec1, msg, msgSize); + n = blsSignatureSerialize(buf, sizeof(buf), &sig1); + CYBOZU_TEST_EQUAL(n, fpSize); + ret = blsSignatureDeserialize(&sig2, buf, n); + CYBOZU_TEST_EQUAL(ret, 0); + CYBOZU_TEST_ASSERT(blsSignatureIsEqual(&sig1, &sig2)); +} + +void blsOrderTest(const char *curveOrder, const char *fieldOrder) +{ + char buf[1024]; + size_t len; + len = blsGetCurveOrder(buf, sizeof(buf)); + CYBOZU_TEST_ASSERT(len > 0); + CYBOZU_TEST_EQUAL(buf, curveOrder); + len = blsGetFieldOrder(buf, sizeof(buf)); + CYBOZU_TEST_ASSERT(len > 0); + CYBOZU_TEST_EQUAL(buf, fieldOrder); +} + +CYBOZU_TEST_AUTO(all) +{ + const int tbl[] = { + blsCurveFp254BNb, +#if BLS_FP_UNIT_SIZE == 6 + blsCurveFp382_1, + blsCurveFp382_2 +#endif + }; + const char *curveOrderTbl[] = { + "16798108731015832284940804142231733909759579603404752749028378864165570215949", + "5540996953667913971058039301942914304734176495422447785042938606876043190415948413757785063597439175372845535461389", + "5541245505022739011583672869577435255026888277144126952448297309161979278754528049907713682488818304329661351460877", + }; + const char *fieldOrderTbl[] = { + "16798108731015832284940804142231733909889187121439069848933715426072753864723", + "5540996953667913971058039301942914304734176495422447785045292539108217242186829586959562222833658991069414454984723", + "5541245505022739011583672869577435255026888277144126952450651294188487038640194767986566260919128250811286032482323", + }; + for (size_t i = 0; i < sizeof(tbl) / sizeof(tbl[0]); i++) { + printf("i=%d\n", (int)i); + blsInit(tbl[i], BLS_FP_UNIT_SIZE); + bls_use_stackTest(); + blsDataTest(); + blsOrderTest(curveOrderTbl[i], fieldOrderTbl[i]); + } +} diff --git a/test/bls_if_test.cpp b/test/bls_if_test.cpp deleted file mode 100644 index 62b914a..0000000 --- a/test/bls_if_test.cpp +++ /dev/null @@ -1,91 +0,0 @@ -#include -#include -#include - -void bls_if_use_stackTest() -{ - blsSecretKey sec; - blsPublicKey pub; - blsSignature sig; - const char *msg = "this is a pen"; - const size_t msgSize = strlen(msg); - - blsSecretKeySetByCSPRNG(&sec); - - blsGetPublicKey(&pub, &sec); - - blsSign(&sig, &sec, msg, msgSize); - - CYBOZU_TEST_ASSERT(blsVerify(&sig, &pub, msg, msgSize)); -} - -void bls_ifDataTest() -{ - const char *msg = "test test"; - const size_t msgSize = strlen(msg); - const size_t fpSize = blsGetOpUnitSize() * sizeof(uint64_t); - blsSecretKey sec1, sec2; - blsSecretKeySetByCSPRNG(&sec1); - char buf[1024]; - size_t n; - int ret; - n = blsSecretKeyGetHexStr(buf, sizeof(buf), &sec1); - CYBOZU_TEST_ASSERT(0 < n && n <= fpSize * 2); - ret = blsSecretKeySetHexStr(&sec2, buf, n); - CYBOZU_TEST_EQUAL(ret, 0); - CYBOZU_TEST_ASSERT(blsSecretKeyIsEqual(&sec1, &sec2)); - blsPublicKey pub1, pub2; - blsGetPublicKey(&pub1, &sec1); - n = blsPublicKeySerialize(buf, sizeof(buf), &pub1); - CYBOZU_TEST_EQUAL(n, fpSize * 2); - ret = blsPublicKeyDeserialize(&pub2, buf, n); - CYBOZU_TEST_EQUAL(ret, 0); - CYBOZU_TEST_ASSERT(blsPublicKeyIsEqual(&pub1, &pub2)); - blsSignature sig1, sig2; - blsSign(&sig1, &sec1, msg, msgSize); - n = blsSignatureSerialize(buf, sizeof(buf), &sig1); - CYBOZU_TEST_EQUAL(n, fpSize); - ret = blsSignatureDeserialize(&sig2, buf, n); - CYBOZU_TEST_EQUAL(ret, 0); - CYBOZU_TEST_ASSERT(blsSignatureIsEqual(&sig1, &sig2)); -} - -void bls_ifOrderTest(const char *curveOrder, const char *fieldOrder) -{ - char buf[1024]; - size_t len; - len = blsGetCurveOrder(buf, sizeof(buf)); - CYBOZU_TEST_ASSERT(len > 0); - CYBOZU_TEST_EQUAL(buf, curveOrder); - len = blsGetFieldOrder(buf, sizeof(buf)); - CYBOZU_TEST_ASSERT(len > 0); - CYBOZU_TEST_EQUAL(buf, fieldOrder); -} - -CYBOZU_TEST_AUTO(all) -{ - const int tbl[] = { - blsCurveFp254BNb, -#if BLS_MAX_OP_UNIT_SIZE == 6 - blsCurveFp382_1, - blsCurveFp382_2 -#endif - }; - const char *curveOrderTbl[] = { - "16798108731015832284940804142231733909759579603404752749028378864165570215949", - "5540996953667913971058039301942914304734176495422447785042938606876043190415948413757785063597439175372845535461389", - "5541245505022739011583672869577435255026888277144126952448297309161979278754528049907713682488818304329661351460877", - }; - const char *fieldOrderTbl[] = { - "16798108731015832284940804142231733909889187121439069848933715426072753864723", - "5540996953667913971058039301942914304734176495422447785045292539108217242186829586959562222833658991069414454984723", - "5541245505022739011583672869577435255026888277144126952450651294188487038640194767986566260919128250811286032482323", - }; - for (size_t i = 0; i < sizeof(tbl) / sizeof(tbl[0]); i++) { - printf("i=%d\n", (int)i); - blsInit(tbl[i], BLS_MAX_OP_UNIT_SIZE); - bls_if_use_stackTest(); - bls_ifDataTest(); - bls_ifOrderTest(curveOrderTbl[i], fieldOrderTbl[i]); - } -} diff --git a/test/bls_test.cpp b/test/bls_test.cpp index f23aad3..2eedd3d 100644 --- a/test/bls_test.cpp +++ b/test/bls_test.cpp @@ -403,7 +403,7 @@ CYBOZU_TEST_AUTO(all) const char *name; } tbl[] = { { bls::CurveFp254BNb, "Fp254" }, -#if BLS_MAX_OP_UNIT_SIZE == 6 +#if BLS_FP_UNIT_SIZE == 6 { bls::CurveFp382_1, "Fp382_1" }, { bls::CurveFp382_2, "Fp382_2" }, #endif -- cgit v1.2.3