new deserialize api

1 files changed, 38 insertions, 38 deletions

diff --git a/src/bls_c.cpp b/src/bls_c.cpp
index 0939802..7179cd5 100644
--- a/src/bls_c.cpp
+++ b/src/bls_c.cpp
@@ -84,7 +84,7 @@ bool isEqualTwoPairings(const G1& P1, const Fp6* Q1coeff, const G1& P2, const G2
 	return e.isOne();
 }
 
-size_t checkAndCopy(char *buf, size_t maxBufSize, const std::string& s)
+mclSize checkAndCopy(char *buf, mclSize maxBufSize, const std::string& s)
 {
 	if (s.size() > maxBufSize + 1) {
 		return 0;
@@ -94,12 +94,12 @@ size_t checkAndCopy(char *buf, size_t maxBufSize, const std::string& s)
 	return s.size();
 }
 
-size_t blsGetOpUnitSize() // FpUint64Size
+mclSize blsGetOpUnitSize() // FpUint64Size
 {
 	return Fp::getUnitSize() * sizeof(mcl::fp::Unit) / sizeof(uint64_t);
 }
 
-int blsGetCurveOrder(char *buf, size_t maxBufSize)
+int blsGetCurveOrder(char *buf, mclSize maxBufSize)
 	try
 {
 	std::string s;
@@ -109,7 +109,7 @@ int blsGetCurveOrder(char *buf, size_t maxBufSize)
 	return 0;
 }
 
-int blsGetFieldOrder(char *buf, size_t maxBufSize)
+int blsGetFieldOrder(char *buf, mclSize maxBufSize)
 	try
 {
 	std::string s;
@@ -128,18 +128,18 @@ 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, size_t size)
+void blsSign(blsSignature *sig, const blsSecretKey *sec, const void *m, mclSize size)
 {
 	G1 Hm;
 	BN::hashAndMapToG1(Hm, m, size);
 	mclBnG1_mulCT(&sig->v, cast(&Hm), &sec->v);
 }
-int blsSecretKeyShare(blsSecretKey *sec, const blsSecretKey* msk, size_t k, const blsId *id)
+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, size_t n)
+int blsSecretKeyRecover(blsSecretKey *sec, const blsSecretKey *secVec, const blsId *idVec, mclSize n)
 {
 	return mclBn_FrLagrangeInterpolation(&sec->v, &idVec->v, &secVec->v, n);
 }
@@ -149,24 +149,24 @@ void blsGetPop(blsSignature *sig, const blsSecretKey *sec)
 	blsPublicKey pub;
 	blsGetPublicKey(&pub, sec);
 	char buf[1024];
-	size_t n = mclBnG2_serialize(buf, sizeof(buf), &pub.v);
+	mclSize n = mclBnG2_serialize(buf, sizeof(buf), &pub.v);
 	assert(n);
 	blsSign(sig, sec, buf, n);
 }
-int blsPublicKeyShare(blsPublicKey *pub, const blsPublicKey *mpk, size_t k, const blsId *id)
+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, size_t 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, size_t n)
+int blsSignatureRecover(blsSignature *sig, const blsSignature *sigVec, const blsId *idVec, mclSize n)
 {
 	return mclBn_G1LagrangeInterpolation(&sig->v, &idVec->v, &sigVec->v, n);
 }
 
-int blsVerify(const blsSignature *sig, const blsPublicKey *pub, const void *m, size_t size)
+int blsVerify(const blsSignature *sig, const blsPublicKey *pub, const void *m, mclSize size)
 {
 	G1 Hm;
 	BN::hashAndMapToG1(Hm, m, size);
@@ -180,7 +180,7 @@ int blsVerify(const blsSignature *sig, const blsPublicKey *pub, const void *m, s
 int blsVerifyPop(const blsSignature *sig, const blsPublicKey *pub)
 {
 	char buf[1024];
-	size_t n = mclBnG2_serialize(buf, sizeof(buf), &pub->v);
+	mclSize n = mclBnG2_serialize(buf, sizeof(buf), &pub->v);
 	assert(n);
 	return blsVerify(sig, pub, buf, n);
 }
@@ -189,35 +189,35 @@ void blsIdSetInt(blsId *id, int x)
 {
 	mclBnFr_setInt(&id->v, x);
 }
-size_t blsIdSerialize(void *buf, size_t maxBufSize, const blsId *id)
+mclSize blsIdSerialize(void *buf, mclSize maxBufSize, const blsId *id)
 {
 	return mclBnFr_serialize(buf, maxBufSize, &id->v);
 }
-size_t blsSecretKeySerialize(void *buf, size_t maxBufSize, const blsSecretKey *sec)
+mclSize blsSecretKeySerialize(void *buf, mclSize maxBufSize, const blsSecretKey *sec)
 {
 	return mclBnFr_serialize(buf, maxBufSize, &sec->v);
 }
-size_t blsPublicKeySerialize(void *buf, size_t maxBufSize, const blsPublicKey *pub)
+mclSize blsPublicKeySerialize(void *buf, mclSize maxBufSize, const blsPublicKey *pub)
 {
 	return mclBnG2_serialize(buf, maxBufSize, &pub->v);
 }
-size_t blsSignatureSerialize(void *buf, size_t maxBufSize, const blsSignature *sig)
+mclSize blsSignatureSerialize(void *buf, mclSize maxBufSize, const blsSignature *sig)
 {
 	return mclBnG1_serialize(buf, maxBufSize, &sig->v);
 }
-int blsIdDeserialize(blsId *id, const void *buf, size_t bufSize)
+mclRetType blsIdDeserialize(blsId *id, const void *buf, mclSize bufSize)
 {
 	return mclBnFr_deserialize(&id->v, buf, bufSize);
 }
-int blsSecretKeyDeserialize(blsSecretKey *sig, const void *buf, size_t bufSize)
+mclRetType blsSecretKeyDeserialize(blsSecretKey *sig, const void *buf, mclSize bufSize)
 {
 	return mclBnFr_deserialize(&sig->v, buf, bufSize);
 }
-int blsPublicKeyDeserialize(blsPublicKey *pub, const void *buf, size_t bufSize)
+mclRetType blsPublicKeyDeserialize(blsPublicKey *pub, const void *buf, mclSize bufSize)
 {
 	return mclBnG2_deserialize(&pub->v, buf, bufSize);
 }
-int blsSignatureDeserialize(blsSignature *sig, const void *buf, size_t bufSize)
+mclRetType blsSignatureDeserialize(blsSignature *sig, const void *buf, mclSize bufSize)
 {
 	return mclBnG1_deserialize(&sig->v, buf, bufSize);
 }
@@ -249,55 +249,55 @@ void blsPublicKeyAdd(blsPublicKey *pub, const blsPublicKey *rhs)
 {
 	mclBnG2_add(&pub->v, &pub->v, &rhs->v);
 }
-int blsIdSetLittleEndian(blsId *id, const void *buf, size_t bufSize)
+int blsIdSetLittleEndian(blsId *id, const void *buf, mclSize bufSize)
 {
 	return mclBnFr_setLittleEndian(&id->v, buf, bufSize);
 }
-int blsIdSetDecStr(blsId *id, const char *buf, size_t bufSize)
+int blsIdSetDecStr(blsId *id, const char *buf, mclSize bufSize)
 {
 	return mclBnFr_setStr(&id->v, buf, bufSize, 10);
 }
-int blsIdSetHexStr(blsId *id, const char *buf, size_t bufSize)
+int blsIdSetHexStr(blsId *id, const char *buf, mclSize bufSize)
 {
 	return mclBnFr_setStr(&id->v, buf, bufSize, 16);
 }
-size_t blsIdGetLittleEndian(void *buf, size_t maxBufSize, const blsId *id)
+mclSize blsIdGetLittleEndian(void *buf, mclSize maxBufSize, const blsId *id)
 {
 	return mclBnFr_serialize(buf, maxBufSize, &id->v);
 }
-size_t blsIdGetDecStr(char *buf, size_t maxBufSize, const blsId *id)
+mclSize blsIdGetDecStr(char *buf, mclSize maxBufSize, const blsId *id)
 {
 	return mclBnFr_getStr(buf, maxBufSize, &id->v, 10);
 }
-size_t blsIdGetHexStr(char *buf, size_t maxBufSize, const blsId *id)
+mclSize blsIdGetHexStr(char *buf, mclSize maxBufSize, const blsId *id)
 {
 	return mclBnFr_getStr(buf, maxBufSize, &id->v, 16);
 }
-int blsSecretKeySetLittleEndian(blsSecretKey *sec, const void *buf, size_t bufSize)
+int blsSecretKeySetLittleEndian(blsSecretKey *sec, const void *buf, mclSize bufSize)
 {
 	return mclBnFr_setLittleEndian(&sec->v, buf, bufSize);
 }
-int blsSecretKeySetDecStr(blsSecretKey *sec, const char *buf, size_t bufSize)
+int blsSecretKeySetDecStr(blsSecretKey *sec, const char *buf, mclSize bufSize)
 {
 	return mclBnFr_setStr(&sec->v, buf, bufSize, 10);
 }
-int blsSecretKeySetHexStr(blsSecretKey *sec, const char *buf, size_t bufSize)
+int blsSecretKeySetHexStr(blsSecretKey *sec, const char *buf, mclSize bufSize)
 {
 	return mclBnFr_setStr(&sec->v, buf, bufSize, 16);
 }
-size_t blsSecretKeyGetLittleEndian(void *buf, size_t maxBufSize, const blsSecretKey *sec)
+mclSize blsSecretKeyGetLittleEndian(void *buf, mclSize maxBufSize, const blsSecretKey *sec)
 {
 	return mclBnFr_serialize(buf, maxBufSize, &sec->v);
 }
-size_t blsSecretKeyGetDecStr(char *buf, size_t maxBufSize, const blsSecretKey *sec)
+mclSize blsSecretKeyGetDecStr(char *buf, mclSize maxBufSize, const blsSecretKey *sec)
 {
 	return mclBnFr_getStr(buf, maxBufSize, &sec->v, 10);
 }
-size_t blsSecretKeyGetHexStr(char *buf, size_t maxBufSize, const blsSecretKey *sec)
+mclSize blsSecretKeyGetHexStr(char *buf, mclSize maxBufSize, const blsSecretKey *sec)
 {
 	return mclBnFr_getStr(buf, maxBufSize, &sec->v, 16);
 }
-int blsHashToSecretKey(blsSecretKey *sec, const void *buf, size_t bufSize)
+int blsHashToSecretKey(blsSecretKey *sec, const void *buf, mclSize bufSize)
 {
 	return mclBnFr_setHashOf(&sec->v, buf, bufSize);
 }
@@ -305,19 +305,19 @@ int blsSecretKeySetByCSPRNG(blsSecretKey *sec)
 {
 	return mclBnFr_setByCSPRNG(&sec->v);
 }
-int blsPublicKeySetHexStr(blsPublicKey *pub, const char *buf, size_t bufSize)
+int blsPublicKeySetHexStr(blsPublicKey *pub, const char *buf, mclSize bufSize)
 {
 	return mclBnG2_setStr(&pub->v, buf, bufSize, 16);
 }
-size_t blsPublicKeyGetHexStr(char *buf, size_t maxBufSize, const blsPublicKey *pub)
+mclSize blsPublicKeyGetHexStr(char *buf, mclSize maxBufSize, const blsPublicKey *pub)
 {
 	return mclBnG2_getStr(buf, maxBufSize, &pub->v, 16);
 }
-int blsSignatureSetHexStr(blsSignature *sig, const char *buf, size_t bufSize)
+int blsSignatureSetHexStr(blsSignature *sig, const char *buf, mclSize bufSize)
 {
 	return mclBnG1_setStr(&sig->v, buf, bufSize, 16);
 }
-size_t blsSignatureGetHexStr(char *buf, size_t maxBufSize, const blsSignature *sig)
+mclSize blsSignatureGetHexStr(char *buf, mclSize maxBufSize, const blsSignature *sig)
 {
 	return mclBnG1_getStr(buf, maxBufSize, &sig->v, 16);
 }