add BLS_DONT_EXPORT macro

1 files changed, 118 insertions, 87 deletions

diff --git a/src/bls_c.cpp b/src/bls_c.cpp
index 108d123..d983ff2 100644
--- a/src/bls_c.cpp
+++ b/src/bls_c.cpp
@@ -76,81 +76,41 @@ int blsInit(int curve, int maxUnitSize)
 static inline const mclBnG1 *cast(const G1* x) { return (const mclBnG1*)x; }
 static inline const mclBnG2 *cast(const G2* x) { return (const mclBnG2*)x; }
 
-/*
-	e(P1, Q1) == e(P2, Q2)
-	<=> finalExp(ML(P1, Q1)) == finalExp(ML(P2, Q2))
-	<=> finalExp(ML(P1, Q1) / ML(P2, Q2)) == 1
-	<=> finalExp(ML(P1, Q1) * ML(-P2, Q2)) == 1
-	Q1 is precomputed
-*/
-bool isEqualTwoPairings(const G1& P1, const Fp6* Q1coeff, const G1& P2, const G2& Q2)
-{
-	Fp12 e;
-	precomputedMillerLoop2mixed(e, P2, Q2, -P1, Q1coeff);
-	finalExp(e, e);
-	return e.isOne();
-}
-
-mclSize blsGetOpUnitSize() // FpUint64Size
-{
-	return Fp::getUnitSize() * sizeof(mcl::fp::Unit) / sizeof(uint64_t);
-}
-
-int blsGetCurveOrder(char *buf, mclSize maxBufSize)
-{
-	return Fr::getModulo(buf, maxBufSize);
-}
-
-int blsGetFieldOrder(char *buf, mclSize maxBufSize)
+void blsIdSetInt(blsId *id, int x)
 {
-	return Fp::getModulo(buf, maxBufSize);
+	mclBnFr_setInt(&id->v, x);
 }
 
-void blsGetGeneratorOfG2(blsPublicKey *pub)
+int blsSecretKeySetLittleEndian(blsSecretKey *sec, const void *buf, mclSize bufSize)
 {
-	*(G2*)pub = getQ();
+	return mclBnFr_setLittleEndian(&sec->v, buf, bufSize);
 }
 
 void blsGetPublicKey(blsPublicKey *pub, const blsSecretKey *sec)
 {
 	mclBnG2_mul(&pub->v, cast(&getQ()), &sec->v);
 }
+
 void blsSign(blsSignature *sig, const blsSecretKey *sec, const void *m, mclSize size)
 {
 	G1 Hm;
 	hashAndMapToG1(Hm, m, size);
 	mclBnG1_mulCT(&sig->v, cast(&Hm), &sec->v);
 }
-int blsSecretKeyShare(blsSecretKey *sec, const blsSecretKey* msk, mclSize k, const blsId *id)
-{
-	return mclBn_FrEvaluatePolynomial(&sec->v, &msk->v, k, &id->v);
-}
 
-int blsSecretKeyRecover(blsSecretKey *sec, const blsSecretKey *secVec, const blsId *idVec, mclSize n)
-{
-	return mclBn_FrLagrangeInterpolation(&sec->v, &idVec->v, &secVec->v, n);
-}
-
-void blsGetPop(blsSignature *sig, const blsSecretKey *sec)
-{
-	blsPublicKey pub;
-	blsGetPublicKey(&pub, sec);
-	char buf[1024];
-	mclSize n = mclBnG2_serialize(buf, sizeof(buf), &pub.v);
-	assert(n);
-	blsSign(sig, sec, buf, n);
-}
-int blsPublicKeyShare(blsPublicKey *pub, const blsPublicKey *mpk, mclSize k, const blsId *id)
-{
-	return mclBn_G2EvaluatePolynomial(&pub->v, &mpk->v, k, &id->v);
-}
-int blsPublicKeyRecover(blsPublicKey *pub, const blsPublicKey *pubVec, const blsId *idVec, mclSize n)
-{
-	return mclBn_G2LagrangeInterpolation(&pub->v, &idVec->v, &pubVec->v, n);
-}
-int blsSignatureRecover(blsSignature *sig, const blsSignature *sigVec, const blsId *idVec, mclSize n)
+/*
+	e(P1, Q1) == e(P2, Q2)
+	<=> finalExp(ML(P1, Q1)) == finalExp(ML(P2, Q2))
+	<=> finalExp(ML(P1, Q1) / ML(P2, Q2)) == 1
+	<=> finalExp(ML(P1, Q1) * ML(-P2, Q2)) == 1
+	Q1 is precomputed
+*/
+bool isEqualTwoPairings(const G1& P1, const Fp6* Q1coeff, const G1& P2, const G2& Q2)
 {
-	return mclBn_G1LagrangeInterpolation(&sig->v, &idVec->v, &sigVec->v, n);
+	Fp12 e;
+	precomputedMillerLoop2mixed(e, P2, Q2, -P1, Q1coeff);
+	finalExp(e, e);
+	return e.isOne();
 }
 
 int blsVerify(const blsSignature *sig, const blsPublicKey *pub, const void *m, mclSize size)
@@ -164,82 +124,127 @@ int blsVerify(const blsSignature *sig, const blsPublicKey *pub, const void *m, m
 	return isEqualTwoPairings(*cast(&sig->v), getQcoeff().data(), Hm, *cast(&pub->v));
 }
 
-int blsVerifyPop(const blsSignature *sig, const blsPublicKey *pub)
-{
-	char buf[1024];
-	mclSize n = mclBnG2_serialize(buf, sizeof(buf), &pub->v);
-	if (n == 0) return 0;
-	return blsVerify(sig, pub, buf, n);
-}
-
-void blsIdSetInt(blsId *id, int x)
-{
-	mclBnFr_setInt(&id->v, x);
-}
 mclSize blsIdSerialize(void *buf, mclSize maxBufSize, const blsId *id)
 {
 	return mclBnFr_serialize(buf, maxBufSize, &id->v);
 }
+
 mclSize blsSecretKeySerialize(void *buf, mclSize maxBufSize, const blsSecretKey *sec)
 {
 	return mclBnFr_serialize(buf, maxBufSize, &sec->v);
 }
+
 mclSize blsPublicKeySerialize(void *buf, mclSize maxBufSize, const blsPublicKey *pub)
 {
 	return mclBnG2_serialize(buf, maxBufSize, &pub->v);
 }
+
 mclSize blsSignatureSerialize(void *buf, mclSize maxBufSize, const blsSignature *sig)
 {
 	return mclBnG1_serialize(buf, maxBufSize, &sig->v);
 }
+
 mclSize blsIdDeserialize(blsId *id, const void *buf, mclSize bufSize)
 {
 	return mclBnFr_deserialize(&id->v, buf, bufSize);
 }
+
 mclSize blsSecretKeyDeserialize(blsSecretKey *sig, const void *buf, mclSize bufSize)
 {
 	return mclBnFr_deserialize(&sig->v, buf, bufSize);
 }
+
 mclSize blsPublicKeyDeserialize(blsPublicKey *pub, const void *buf, mclSize bufSize)
 {
 	return mclBnG2_deserialize(&pub->v, buf, bufSize);
 }
+
 mclSize blsSignatureDeserialize(blsSignature *sig, const void *buf, mclSize bufSize)
 {
 	return mclBnG1_deserialize(&sig->v, buf, bufSize);
 }
+
 int blsIdIsEqual(const blsId *lhs, const blsId *rhs)
 {
 	return mclBnFr_isEqual(&lhs->v, &rhs->v);
 }
+
 int blsSecretKeyIsEqual(const blsSecretKey *lhs, const blsSecretKey *rhs)
 {
 	return mclBnFr_isEqual(&lhs->v, &rhs->v);
 }
+
 int blsPublicKeyIsEqual(const blsPublicKey *lhs, const blsPublicKey *rhs)
 {
 	return mclBnG2_isEqual(&lhs->v, &rhs->v);
 }
+
 int blsSignatureIsEqual(const blsSignature *lhs, const blsSignature *rhs)
 {
 	return mclBnG1_isEqual(&lhs->v, &rhs->v);
 }
+
+int blsSecretKeyShare(blsSecretKey *sec, const blsSecretKey* msk, mclSize k, const blsId *id)
+{
+	return mclBn_FrEvaluatePolynomial(&sec->v, &msk->v, k, &id->v);
+}
+
+int blsPublicKeyShare(blsPublicKey *pub, const blsPublicKey *mpk, mclSize k, const blsId *id)
+{
+	return mclBn_G2EvaluatePolynomial(&pub->v, &mpk->v, k, &id->v);
+}
+
+int blsSecretKeyRecover(blsSecretKey *sec, const blsSecretKey *secVec, const blsId *idVec, mclSize n)
+{
+	return mclBn_FrLagrangeInterpolation(&sec->v, &idVec->v, &secVec->v, n);
+}
+
+int blsPublicKeyRecover(blsPublicKey *pub, const blsPublicKey *pubVec, const blsId *idVec, mclSize n)
+{
+	return mclBn_G2LagrangeInterpolation(&pub->v, &idVec->v, &pubVec->v, n);
+}
+
+int blsSignatureRecover(blsSignature *sig, const blsSignature *sigVec, const blsId *idVec, mclSize n)
+{
+	return mclBn_G1LagrangeInterpolation(&sig->v, &idVec->v, &sigVec->v, n);
+}
+
 void blsSecretKeyAdd(blsSecretKey *sec, const blsSecretKey *rhs)
 {
 	mclBnFr_add(&sec->v, &sec->v, &rhs->v);
 }
+
+void blsPublicKeyAdd(blsPublicKey *pub, const blsPublicKey *rhs)
+{
+	mclBnG2_add(&pub->v, &pub->v, &rhs->v);
+}
+
 void blsSignatureAdd(blsSignature *sig, const blsSignature *rhs)
 {
 	mclBnG1_add(&sig->v, &sig->v, &rhs->v);
 }
-void blsPublicKeyAdd(blsPublicKey *pub, const blsPublicKey *rhs)
+
+#ifndef BLS_MINIMUM_API
+mclSize blsGetOpUnitSize() // FpUint64Size
 {
-	mclBnG2_add(&pub->v, &pub->v, &rhs->v);
+	return Fp::getUnitSize() * sizeof(mcl::fp::Unit) / sizeof(uint64_t);
 }
-int blsIdSetLittleEndian(blsId *id, const void *buf, mclSize bufSize)
+
+int blsGetCurveOrder(char *buf, mclSize maxBufSize)
 {
-	return mclBnFr_setLittleEndian(&id->v, buf, bufSize);
+	return (int)Fr::getModulo(buf, maxBufSize);
 }
+
+int blsGetFieldOrder(char *buf, mclSize maxBufSize)
+{
+	return (int)Fp::getModulo(buf, maxBufSize);
+}
+
+void blsGetGeneratorOfG2(blsPublicKey *pub)
+{
+	*(G2*)pub = getQ();
+}
+
 int blsIdSetDecStr(blsId *id, const char *buf, mclSize bufSize)
 {
 	return mclBnFr_setStr(&id->v, buf, bufSize, 10);
@@ -248,21 +253,55 @@ int blsIdSetHexStr(blsId *id, const char *buf, mclSize bufSize)
 {
 	return mclBnFr_setStr(&id->v, buf, bufSize, 16);
 }
-mclSize blsIdGetLittleEndian(void *buf, mclSize maxBufSize, const blsId *id)
+
+int blsIdSetLittleEndian(blsId *id, const void *buf, mclSize bufSize)
 {
-	return mclBnFr_serialize(buf, maxBufSize, &id->v);
+	return mclBnFr_setLittleEndian(&id->v, buf, bufSize);
 }
+
 mclSize blsIdGetDecStr(char *buf, mclSize maxBufSize, const blsId *id)
 {
 	return mclBnFr_getStr(buf, maxBufSize, &id->v, 10);
 }
+
 mclSize blsIdGetHexStr(char *buf, mclSize maxBufSize, const blsId *id)
 {
 	return mclBnFr_getStr(buf, maxBufSize, &id->v, 16);
 }
-int blsSecretKeySetLittleEndian(blsSecretKey *sec, const void *buf, mclSize bufSize)
+
+int blsHashToSecretKey(blsSecretKey *sec, const void *buf, mclSize bufSize)
 {
-	return mclBnFr_setLittleEndian(&sec->v, buf, bufSize);
+	return mclBnFr_setHashOf(&sec->v, buf, bufSize);
+}
+
+#ifndef MCL_DONT_USE_CSPRNG
+int blsSecretKeySetByCSPRNG(blsSecretKey *sec)
+{
+	return mclBnFr_setByCSPRNG(&sec->v);
+}
+#endif
+
+void blsGetPop(blsSignature *sig, const blsSecretKey *sec)
+{
+	blsPublicKey pub;
+	blsGetPublicKey(&pub, sec);
+	char buf[1024];
+	mclSize n = mclBnG2_serialize(buf, sizeof(buf), &pub.v);
+	assert(n);
+	blsSign(sig, sec, buf, n);
+}
+
+int blsVerifyPop(const blsSignature *sig, const blsPublicKey *pub)
+{
+	char buf[1024];
+	mclSize n = mclBnG2_serialize(buf, sizeof(buf), &pub->v);
+	if (n == 0) return 0;
+	return blsVerify(sig, pub, buf, n);
+}
+
+mclSize blsIdGetLittleEndian(void *buf, mclSize maxBufSize, const blsId *id)
+{
+	return mclBnFr_serialize(buf, maxBufSize, &id->v);
 }
 int blsSecretKeySetDecStr(blsSecretKey *sec, const char *buf, mclSize bufSize)
 {
@@ -284,16 +323,6 @@ mclSize blsSecretKeyGetHexStr(char *buf, mclSize maxBufSize, const blsSecretKey
 {
 	return mclBnFr_getStr(buf, maxBufSize, &sec->v, 16);
 }
-int blsHashToSecretKey(blsSecretKey *sec, const void *buf, mclSize bufSize)
-{
-	return mclBnFr_setHashOf(&sec->v, buf, bufSize);
-}
-#ifndef MCL_DONT_USE_CSPRNG
-int blsSecretKeySetByCSPRNG(blsSecretKey *sec)
-{
-	return mclBnFr_setByCSPRNG(&sec->v);
-}
-#endif
 int blsPublicKeySetHexStr(blsPublicKey *pub, const char *buf, mclSize bufSize)
 {
 	return mclBnG2_setStr(&pub->v, buf, bufSize, 16);
@@ -315,3 +344,5 @@ void blsDHKeyExchange(blsPublicKey *out, const blsSecretKey *sec, const blsPubli
 	mclBnG2_mulCT(&out->v, &pub->v, &sec->v);
 }
 
+#endif
+