change size_t to mclSize of bn.h for JS

3 files changed, 70 insertions, 66 deletions

diff --git a/Makefile b/Makefile
index 98ea8c5..aefbe51 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ $(MCL_SLIB): $(LIB_OBJ)
 $(BN256_LIB): $(BN256_OBJ)
 	$(AR) $@ $(BN256_OBJ)
 
-$(SHE256_OBJ) : src/she_c256.cpp src/she_c_impl.hpp include/mcl/she.h
+$(SHE256_OBJ) : src/she_c256.cpp src/she_c_impl.hpp include/mcl/she.h include/mcl/bn.h
 $(SHE256_LIB): $(SHE256_OBJ)
 	$(AR) $@ $(SHE256_OBJ)
 
@@ -209,7 +209,7 @@ 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
 
-EMCC_OPT=-I./include -I./src -I../cybozulib/include
+EMCC_OPT=-I./include -I./src -I../cybozulib/include -Wall -Wextra
 EMCC_OPT+=-O3 -DNDEBUG -DMCLBN_FP_UNIT_SIZE=4 -DMCL_MAX_BIT_SIZE=256 -DMCLSHE_WIN_SIZE=8
 EMCC_OPT+=-s WASM=1 -s DISABLE_EXCEPTION_CATCHING=0 -s NO_EXIT_RUNTIME=1 -s MODULARIZE=1
 JS_DEP=src/fp.cpp src/she_c256.cpp src/she_c_impl.hpp include/mcl/she.hpp Makefile
diff --git a/include/mcl/bn.h b/include/mcl/bn.h
index 5aee94c..1b92e9f 100644
--- a/include/mcl/bn.h
+++ b/include/mcl/bn.h
@@ -31,8 +31,12 @@
 #else
 #ifdef __EMSCRIPTEN__
 	#define MCLBN_DLL_API __attribute__((used))
+	typedef unsigned int mclSize;
+	typedef int mclInt;
 #else
 	#define MCLBN_DLL_API
+	typedef size_t mclSize;
+	typedef int64_t mclInt;
 #endif
 #endif
 
@@ -117,20 +121,20 @@ MCLBN_DLL_API int mclBn_getOpUnitSize();
 	return decimal string of the order of the curve(=the characteristic of Fr)
 	return str(buf) if success
 */
-MCLBN_DLL_API size_t mclBn_getCurveOrder(char *buf, size_t maxBufSize);
+MCLBN_DLL_API mclSize mclBn_getCurveOrder(char *buf, mclSize maxBufSize);
 
 /*
 	return decimal string of the characteristic of Fp
 	return str(buf) if success
 */
-MCLBN_DLL_API size_t mclBn_getFieldOrder(char *buf, size_t maxBufSize);
+MCLBN_DLL_API mclSize mclBn_getFieldOrder(char *buf, mclSize maxBufSize);
 
 ////////////////////////////////////////////////
 // set zero
 MCLBN_DLL_API void mclBnFr_clear(mclBnFr *x);
 
 // set x to y
-MCLBN_DLL_API void mclBnFr_setInt(mclBnFr *y, int64_t x);
+MCLBN_DLL_API void mclBnFr_setInt(mclBnFr *y, mclInt x);
 MCLBN_DLL_API void mclBnFr_setInt32(mclBnFr *y, int x);
 
 /*
@@ -139,11 +143,11 @@ MCLBN_DLL_API void mclBnFr_setInt32(mclBnFr *y, int x);
 	16 : hexadecimal number
 */
 // return 0 if success
-MCLBN_DLL_API int mclBnFr_setStr(mclBnFr *x, const char *buf, size_t bufSize, int ioMode);
+MCLBN_DLL_API int mclBnFr_setStr(mclBnFr *x, const char *buf, mclSize bufSize, int ioMode);
 // return error if buf >= r
-MCLBN_DLL_API int mclBnFr_deserialize(mclBnFr *x, const void *buf, size_t bufSize);
+MCLBN_DLL_API int mclBnFr_deserialize(mclBnFr *x, const void *buf, mclSize bufSize);
 // mask buf with (1 << (bitLen(r) - 1)) - 1 if buf >= r
-MCLBN_DLL_API int mclBnFr_setLittleEndian(mclBnFr *x, const void *buf, size_t bufSize);
+MCLBN_DLL_API int mclBnFr_setLittleEndian(mclBnFr *x, const void *buf, mclSize bufSize);
 
 // return 1 if true and 0 otherwise
 MCLBN_DLL_API int mclBnFr_isValid(const mclBnFr *x);
@@ -156,12 +160,12 @@ MCLBN_DLL_API int mclBnFr_setByCSPRNG(mclBnFr *x);
 
 // hash(s) and set x
 // return 0 if success
-MCLBN_DLL_API int mclBnFr_setHashOf(mclBnFr *x, const void *buf, size_t bufSize);
+MCLBN_DLL_API int mclBnFr_setHashOf(mclBnFr *x, const void *buf, mclSize bufSize);
 
 // return strlen(buf) if sucess else 0
-MCLBN_DLL_API size_t mclBnFr_getStr(char *buf, size_t maxBufSize, const mclBnFr *x, int ioMode);
+MCLBN_DLL_API mclSize mclBnFr_getStr(char *buf, mclSize maxBufSize, const mclBnFr *x, int ioMode);
 // return written byte if sucess else 0
-MCLBN_DLL_API size_t mclBnFr_serialize(void *buf, size_t maxBufSize, const mclBnFr *x);
+MCLBN_DLL_API mclSize mclBnFr_serialize(void *buf, mclSize maxBufSize, const mclBnFr *x);
 
 MCLBN_DLL_API void mclBnFr_neg(mclBnFr *y, const mclBnFr *x);
 MCLBN_DLL_API void mclBnFr_inv(mclBnFr *y, const mclBnFr *x);
@@ -175,20 +179,20 @@ MCLBN_DLL_API void mclBnFr_div(mclBnFr *z, const mclBnFr *x, const mclBnFr *y);
 MCLBN_DLL_API void mclBnG1_clear(mclBnG1 *x);
 
 // return 0 if success
-MCLBN_DLL_API int mclBnG1_setStr(mclBnG1 *x, const char *buf, size_t bufSize, int ioMode);
-MCLBN_DLL_API int mclBnG1_deserialize(mclBnG1 *x, const void *buf, size_t bufSize);
+MCLBN_DLL_API int mclBnG1_setStr(mclBnG1 *x, const char *buf, mclSize bufSize, int ioMode);
+MCLBN_DLL_API int mclBnG1_deserialize(mclBnG1 *x, const void *buf, mclSize bufSize);
 
 // return 1 if true and 0 otherwise
 MCLBN_DLL_API int mclBnG1_isValid(const mclBnG1 *x);
 MCLBN_DLL_API int mclBnG1_isEqual(const mclBnG1 *x, const mclBnG1 *y);
 MCLBN_DLL_API int mclBnG1_isZero(const mclBnG1 *x);
 
-MCLBN_DLL_API int mclBnG1_hashAndMapTo(mclBnG1 *x, const void *buf, size_t bufSize);
+MCLBN_DLL_API int mclBnG1_hashAndMapTo(mclBnG1 *x, const void *buf, mclSize bufSize);
 
 // return 0 if success
-MCLBN_DLL_API size_t mclBnG1_getStr(char *buf, size_t maxBufSize, const mclBnG1 *x, int ioMode);
+MCLBN_DLL_API mclSize mclBnG1_getStr(char *buf, mclSize maxBufSize, const mclBnG1 *x, int ioMode);
 // return written size if sucess else 0
-MCLBN_DLL_API size_t mclBnG1_serialize(void *buf, size_t maxBufSize, const mclBnG1 *x);
+MCLBN_DLL_API mclSize mclBnG1_serialize(void *buf, mclSize maxBufSize, const mclBnG1 *x);
 
 MCLBN_DLL_API void mclBnG1_neg(mclBnG1 *y, const mclBnG1 *x);
 MCLBN_DLL_API void mclBnG1_dbl(mclBnG1 *y, const mclBnG1 *x);
@@ -206,20 +210,20 @@ MCLBN_DLL_API void mclBnG1_mulCT(mclBnG1 *z, const mclBnG1 *x, const mclBnFr *y)
 MCLBN_DLL_API void mclBnG2_clear(mclBnG2 *x);
 
 // return 0 if success
-MCLBN_DLL_API int mclBnG2_setStr(mclBnG2 *x, const char *buf, size_t bufSize, int ioMode);
-MCLBN_DLL_API int mclBnG2_deserialize(mclBnG2 *x, const void *buf, size_t bufSize);
+MCLBN_DLL_API int mclBnG2_setStr(mclBnG2 *x, const char *buf, mclSize bufSize, int ioMode);
+MCLBN_DLL_API int mclBnG2_deserialize(mclBnG2 *x, const void *buf, mclSize bufSize);
 
 // return 1 if true and 0 otherwise
 MCLBN_DLL_API int mclBnG2_isValid(const mclBnG2 *x);
 MCLBN_DLL_API int mclBnG2_isEqual(const mclBnG2 *x, const mclBnG2 *y);
 MCLBN_DLL_API int mclBnG2_isZero(const mclBnG2 *x);
 
-MCLBN_DLL_API int mclBnG2_hashAndMapTo(mclBnG2 *x, const void *buf, size_t bufSize);
+MCLBN_DLL_API int mclBnG2_hashAndMapTo(mclBnG2 *x, const void *buf, mclSize bufSize);
 
 // return 0 if success
-MCLBN_DLL_API size_t mclBnG2_getStr(char *buf, size_t maxBufSize, const mclBnG2 *x, int ioMode);
+MCLBN_DLL_API mclSize mclBnG2_getStr(char *buf, mclSize maxBufSize, const mclBnG2 *x, int ioMode);
 // return written size if sucess else 0
-MCLBN_DLL_API size_t mclBnG2_serialize(void *buf, size_t maxBufSize, const mclBnG2 *x);
+MCLBN_DLL_API mclSize mclBnG2_serialize(void *buf, mclSize maxBufSize, const mclBnG2 *x);
 
 MCLBN_DLL_API void mclBnG2_neg(mclBnG2 *y, const mclBnG2 *x);
 MCLBN_DLL_API void mclBnG2_dbl(mclBnG2 *y, const mclBnG2 *x);
@@ -235,12 +239,12 @@ MCLBN_DLL_API void mclBnG2_mulCT(mclBnG2 *z, const mclBnG2 *x, const mclBnFr *y)
 // set zero
 MCLBN_DLL_API void mclBnGT_clear(mclBnGT *x);
 // set x to y
-MCLBN_DLL_API void mclBnGT_setInt(mclBnGT *y, int64_t x);
+MCLBN_DLL_API void mclBnGT_setInt(mclBnGT *y, mclInt x);
 MCLBN_DLL_API void mclBnGT_setInt32(mclBnGT *y, int x);
 
 // return 0 if success
-MCLBN_DLL_API int mclBnGT_setStr(mclBnGT *x, const char *buf, size_t bufSize, int ioMode);
-MCLBN_DLL_API int mclBnGT_deserialize(mclBnGT *x, const void *buf, size_t bufSize);
+MCLBN_DLL_API int mclBnGT_setStr(mclBnGT *x, const char *buf, mclSize bufSize, int ioMode);
+MCLBN_DLL_API int mclBnGT_deserialize(mclBnGT *x, const void *buf, mclSize bufSize);
 
 // return 1 if true and 0 otherwise
 MCLBN_DLL_API int mclBnGT_isEqual(const mclBnGT *x, const mclBnGT *y);
@@ -248,9 +252,9 @@ MCLBN_DLL_API int mclBnGT_isZero(const mclBnGT *x);
 MCLBN_DLL_API int mclBnGT_isOne(const mclBnGT *x);
 
 // return 0 if success
-MCLBN_DLL_API size_t mclBnGT_getStr(char *buf, size_t maxBufSize, const mclBnGT *x, int ioMode);
+MCLBN_DLL_API mclSize mclBnGT_getStr(char *buf, mclSize maxBufSize, const mclBnGT *x, int ioMode);
 // return written size if sucess else 0
-MCLBN_DLL_API size_t mclBnGT_serialize(void *buf, size_t maxBufSize, const mclBnGT *x);
+MCLBN_DLL_API mclSize mclBnGT_serialize(void *buf, mclSize maxBufSize, const mclBnGT *x);
 
 MCLBN_DLL_API void mclBnGT_neg(mclBnGT *y, const mclBnGT *x);
 MCLBN_DLL_API void mclBnGT_inv(mclBnGT *y, const mclBnGT *x);
@@ -288,18 +292,18 @@ MCLBN_DLL_API void mclBn_precomputedMillerLoop2(mclBnGT *f, const mclBnG1 *P1, c
 	return 0 if success else -1
 	@note k >= 2, xVec[i] != 0, xVec[i] != xVec[j] for i != j
 */
-MCLBN_DLL_API int mclBn_FrLagrangeInterpolation(mclBnFr *out, const mclBnFr *xVec, const mclBnFr *yVec, size_t k);
-MCLBN_DLL_API int mclBn_G1LagrangeInterpolation(mclBnG1 *out, const mclBnFr *xVec, const mclBnG1 *yVec, size_t k);
-MCLBN_DLL_API int mclBn_G2LagrangeInterpolation(mclBnG2 *out, const mclBnFr *xVec, const mclBnG2 *yVec, size_t k);
+MCLBN_DLL_API int mclBn_FrLagrangeInterpolation(mclBnFr *out, const mclBnFr *xVec, const mclBnFr *yVec, mclSize k);
+MCLBN_DLL_API int mclBn_G1LagrangeInterpolation(mclBnG1 *out, const mclBnFr *xVec, const mclBnG1 *yVec, mclSize k);
+MCLBN_DLL_API int mclBn_G2LagrangeInterpolation(mclBnG2 *out, const mclBnFr *xVec, const mclBnG2 *yVec, mclSize k);
 
 /*
 	evaluate polynomial
 	out = f(x) = c[0] + c[1] * x + c[2] * x^2 + ... + c[cSize - 1] * x^(cSize - 1)
 	@note cSize >= 2
 */
-MCLBN_DLL_API int mclBn_FrEvaluatePolynomial(mclBnFr *out, const mclBnFr *cVec, size_t cSize, const mclBnFr *x);
-MCLBN_DLL_API int mclBn_G1EvaluatePolynomial(mclBnG1 *out, const mclBnG1 *cVec, size_t cSize, const mclBnFr *x);
-MCLBN_DLL_API int mclBn_G2EvaluatePolynomial(mclBnG2 *out, const mclBnG2 *cVec, size_t cSize, const mclBnFr *x);
+MCLBN_DLL_API int mclBn_FrEvaluatePolynomial(mclBnFr *out, const mclBnFr *cVec, mclSize cSize, const mclBnFr *x);
+MCLBN_DLL_API int mclBn_G1EvaluatePolynomial(mclBnG1 *out, const mclBnG1 *cVec, mclSize cSize, const mclBnFr *x);
+MCLBN_DLL_API int mclBn_G2EvaluatePolynomial(mclBnG2 *out, const mclBnG2 *cVec, mclSize cSize, const mclBnFr *x);
 
 
 #ifdef __cplusplus
diff --git a/src/bn_c_impl.hpp b/src/bn_c_impl.hpp
index fee1576..d4703b8 100644
--- a/src/bn_c_impl.hpp
+++ b/src/bn_c_impl.hpp
@@ -48,12 +48,12 @@ static int closeErrFile()
 }
 
 template<class T>
-size_t serialize(void *buf, size_t maxBufSize, const T *x, int ioMode, const char *msg)
+mclSize serialize(void *buf, mclSize maxBufSize, const T *x, int ioMode, const char *msg)
 	try
 {
 	std::string str;
 	cast(x)->getStr(str, ioMode);
-	size_t terminate = (ioMode == 10 || ioMode == 16) ? 1 : 0;
+	mclSize terminate = (ioMode == 10 || ioMode == 16) ? 1 : 0;
 	if (str.size() + terminate > maxBufSize) {
 		if (g_fp) fprintf(g_fp, "%s:serialize:small maxBufSize %d %d %d\n", msg, (int)maxBufSize, (int)str.size(), (int)terminate);
 		return 0;
@@ -69,7 +69,7 @@ size_t serialize(void *buf, size_t maxBufSize, const T *x, int ioMode, const cha
 }
 
 template<class T>
-int deserialize(T *x, const void *buf, size_t bufSize, int ioMode, const char *msg)
+int deserialize(T *x, const void *buf, mclSize bufSize, int ioMode, const char *msg)
 	try
 {
 	std::string str;
@@ -141,7 +141,7 @@ int mclBn_getOpUnitSize()
 	return (int)Fp::getUnitSize() * sizeof(mcl::fp::Unit) / sizeof(uint64_t);
 }
 
-size_t copyStrAndReturnSize(char *buf, size_t maxBufSize, const std::string& str)
+mclSize copyStrAndReturnSize(char *buf, mclSize maxBufSize, const std::string& str)
 {
 	if (str.size() >= maxBufSize) return 0;
 	memcpy(buf, str.c_str(), str.size());
@@ -149,14 +149,14 @@ size_t copyStrAndReturnSize(char *buf, size_t maxBufSize, const std::string& str
 	return str.size();
 }
 
-size_t mclBn_getCurveOrder(char *buf, size_t maxBufSize)
+mclSize mclBn_getCurveOrder(char *buf, mclSize maxBufSize)
 {
 	std::string str;
 	Fr::getModulo(str);
 	return copyStrAndReturnSize(buf, maxBufSize, str);
 }
 
-size_t mclBn_getFieldOrder(char *buf, size_t maxBufSize)
+mclSize mclBn_getFieldOrder(char *buf, mclSize maxBufSize)
 {
 	std::string str;
 	Fp::getModulo(str);
@@ -170,7 +170,7 @@ void mclBnFr_clear(mclBnFr *x)
 }
 
 // set x to y
-void mclBnFr_setInt(mclBnFr *y, int64_t x)
+void mclBnFr_setInt(mclBnFr *y, mclInt x)
 {
 	*cast(y) = x;
 }
@@ -179,11 +179,11 @@ void mclBnFr_setInt32(mclBnFr *y, int x)
 	*cast(y) = x;
 }
 
-int mclBnFr_setStr(mclBnFr *x, const char *buf, size_t bufSize, int ioMode)
+int mclBnFr_setStr(mclBnFr *x, const char *buf, mclSize bufSize, int ioMode)
 {
 	return deserialize(x, buf, bufSize, ioMode, "mclBnFr_setStr");
 }
-int mclBnFr_setLittleEndian(mclBnFr *x, const void *buf, size_t bufSize)
+int mclBnFr_setLittleEndian(mclBnFr *x, const void *buf, mclSize bufSize)
 	try
 {
 	cast(x)->setArrayMask((const char *)buf, bufSize);
@@ -192,7 +192,7 @@ int mclBnFr_setLittleEndian(mclBnFr *x, const void *buf, size_t bufSize)
 	if (g_fp) fprintf(g_fp, "setArrayMask %s\n", e.what());
 	return -1;
 }
-int mclBnFr_deserialize(mclBnFr *x, const void *buf, size_t bufSize)
+int mclBnFr_deserialize(mclBnFr *x, const void *buf, mclSize bufSize)
 {
 	return deserialize(x, buf, bufSize, mcl::IoFixedSizeByteSeq, "mclBnFr_deserialize");
 }
@@ -225,7 +225,7 @@ int mclBnFr_setByCSPRNG(mclBnFr *x)
 }
 
 // hash(buf) and set x
-int mclBnFr_setHashOf(mclBnFr *x, const void *buf, size_t bufSize)
+int mclBnFr_setHashOf(mclBnFr *x, const void *buf, mclSize bufSize)
 	try
 {
 	cast(x)->setHashOf(buf, bufSize);
@@ -235,11 +235,11 @@ int mclBnFr_setHashOf(mclBnFr *x, const void *buf, size_t bufSize)
 	return -1;
 }
 
-size_t mclBnFr_getStr(char *buf, size_t maxBufSize, const mclBnFr *x, int ioMode)
+mclSize mclBnFr_getStr(char *buf, mclSize maxBufSize, const mclBnFr *x, int ioMode)
 {
 	return serialize(buf, maxBufSize, x, ioMode, "mclBnFr_getStr");
 }
-size_t mclBnFr_serialize(void *buf, size_t maxBufSize, const mclBnFr *x)
+mclSize mclBnFr_serialize(void *buf, mclSize maxBufSize, const mclBnFr *x)
 {
 	return serialize(buf, maxBufSize, x, mcl::IoFixedSizeByteSeq, "mclBnFr_serialize");
 }
@@ -276,11 +276,11 @@ void mclBnG1_clear(mclBnG1 *x)
 	cast(x)->clear();
 }
 
-int mclBnG1_setStr(mclBnG1 *x, const char *buf, size_t bufSize, int ioMode)
+int mclBnG1_setStr(mclBnG1 *x, const char *buf, mclSize bufSize, int ioMode)
 {
 	return deserialize(x, buf, bufSize, ioMode, "mclBnG1_setStr");
 }
-int mclBnG1_deserialize(mclBnG1 *x, const void *buf, size_t bufSize)
+int mclBnG1_deserialize(mclBnG1 *x, const void *buf, mclSize bufSize)
 {
 	return deserialize(x, buf, bufSize, mcl::IoFixedSizeByteSeq, "mclBnG1_deserialize");
 }
@@ -299,7 +299,7 @@ int mclBnG1_isZero(const mclBnG1 *x)
 	return cast(x)->isZero();
 }
 
-int mclBnG1_hashAndMapTo(mclBnG1 *x, const void *buf, size_t bufSize)
+int mclBnG1_hashAndMapTo(mclBnG1 *x, const void *buf, mclSize bufSize)
 	try
 {
 	BN::hashAndMapToG1(*cast(x), buf, bufSize);
@@ -309,12 +309,12 @@ int mclBnG1_hashAndMapTo(mclBnG1 *x, const void *buf, size_t bufSize)
 	return 1;
 }
 
-size_t mclBnG1_getStr(char *buf, size_t maxBufSize, const mclBnG1 *x, int ioMode)
+mclSize mclBnG1_getStr(char *buf, mclSize maxBufSize, const mclBnG1 *x, int ioMode)
 {
 	return serialize(buf, maxBufSize, x, ioMode, "mclBnG1_getStr");
 }
 
-size_t mclBnG1_serialize(void *buf, size_t maxBufSize, const mclBnG1 *x)
+mclSize mclBnG1_serialize(void *buf, mclSize maxBufSize, const mclBnG1 *x)
 {
 	return serialize(buf, maxBufSize, x, mcl::IoFixedSizeByteSeq, "mclBnG1_serialize");
 }
@@ -351,11 +351,11 @@ void mclBnG2_clear(mclBnG2 *x)
 	cast(x)->clear();
 }
 
-int mclBnG2_setStr(mclBnG2 *x, const char *buf, size_t bufSize, int ioMode)
+int mclBnG2_setStr(mclBnG2 *x, const char *buf, mclSize bufSize, int ioMode)
 {
 	return deserialize(x, buf, bufSize, ioMode, "mclBnG2_setStr");
 }
-int mclBnG2_deserialize(mclBnG2 *x, const void *buf, size_t bufSize)
+int mclBnG2_deserialize(mclBnG2 *x, const void *buf, mclSize bufSize)
 {
 	return deserialize(x, buf, bufSize, mcl::IoFixedSizeByteSeq, "mclBnG2_deserialize");
 }
@@ -374,7 +374,7 @@ int mclBnG2_isZero(const mclBnG2 *x)
 	return cast(x)->isZero();
 }
 
-int mclBnG2_hashAndMapTo(mclBnG2 *x, const void *buf, size_t bufSize)
+int mclBnG2_hashAndMapTo(mclBnG2 *x, const void *buf, mclSize bufSize)
 	try
 {
 	BN::hashAndMapToG2(*cast(x), buf, bufSize);
@@ -384,11 +384,11 @@ int mclBnG2_hashAndMapTo(mclBnG2 *x, const void *buf, size_t bufSize)
 	return 1;
 }
 
-size_t mclBnG2_getStr(char *buf, size_t maxBufSize, const mclBnG2 *x, int ioMode)
+mclSize mclBnG2_getStr(char *buf, mclSize maxBufSize, const mclBnG2 *x, int ioMode)
 {
 	return serialize(buf, maxBufSize, x, ioMode, "mclBnG2_getStr");
 }
-size_t mclBnG2_serialize(void *buf, size_t maxBufSize, const mclBnG2 *x)
+mclSize mclBnG2_serialize(void *buf, mclSize maxBufSize, const mclBnG2 *x)
 {
 	return serialize(buf, maxBufSize, x, mcl::IoFixedSizeByteSeq, "mclBnG2_serialize");
 }
@@ -424,7 +424,7 @@ void mclBnGT_clear(mclBnGT *x)
 {
 	cast(x)->clear();
 }
-void mclBnGT_setInt(mclBnGT *y, int64_t x)
+void mclBnGT_setInt(mclBnGT *y, mclInt x)
 {
 	cast(y)->clear();
 	*(cast(y)->getFp0()) = x;
@@ -435,11 +435,11 @@ void mclBnGT_setInt32(mclBnGT *y, int x)
 	*(cast(y)->getFp0()) = x;
 }
 
-int mclBnGT_setStr(mclBnGT *x, const char *buf, size_t bufSize, int ioMode)
+int mclBnGT_setStr(mclBnGT *x, const char *buf, mclSize bufSize, int ioMode)
 {
 	return deserialize(x, buf, bufSize, ioMode, "mclBnGT_setStr");
 }
-int mclBnGT_deserialize(mclBnGT *x, const void *buf, size_t bufSize)
+int mclBnGT_deserialize(mclBnGT *x, const void *buf, mclSize bufSize)
 {
 	return deserialize(x, buf, bufSize, mcl::IoFixedSizeByteSeq, "mclBnGT_deserialize");
 }
@@ -458,12 +458,12 @@ int mclBnGT_isOne(const mclBnGT *x)
 	return cast(x)->isOne();
 }
 
-size_t mclBnGT_getStr(char *buf, size_t maxBufSize, const mclBnGT *x, int ioMode)
+mclSize mclBnGT_getStr(char *buf, mclSize maxBufSize, const mclBnGT *x, int ioMode)
 {
 	return serialize(buf, maxBufSize, x, ioMode, "mclBnGT_getStr");
 }
 
-size_t mclBnGT_serialize(void *buf, size_t maxBufSize, const mclBnGT *x)
+mclSize mclBnGT_serialize(void *buf, mclSize maxBufSize, const mclBnGT *x)
 {
 	return serialize(buf, maxBufSize, x, mcl::IoFixedSizeByteSeq, "mclBnGT_serialize");
 }
@@ -534,7 +534,7 @@ void mclBn_precomputedMillerLoop2(mclBnGT *f, const mclBnG1 *P1, const uint64_t
 	BN::precomputedMillerLoop2(*cast(f), *cast(P1), cast(Q1buf), *cast(P2), cast(Q2buf));
 }
 
-int mclBn_FrLagrangeInterpolation(mclBnFr *out, const mclBnFr *xVec, const mclBnFr *yVec, size_t k)
+int mclBn_FrLagrangeInterpolation(mclBnFr *out, const mclBnFr *xVec, const mclBnFr *yVec, mclSize k)
 	try
 {
 	mcl::LagrangeInterpolation(*cast(out), cast(xVec), cast(yVec), k);
@@ -543,7 +543,7 @@ int mclBn_FrLagrangeInterpolation(mclBnFr *out, const mclBnFr *xVec, const mclBn
 	if (g_fp) fprintf(g_fp, "mclBn_FrLagrangeInterpolation %s\n", e.what());
 	return -1;
 }
-int mclBn_G1LagrangeInterpolation(mclBnG1 *out, const mclBnFr *xVec, const mclBnG1 *yVec, size_t k)
+int mclBn_G1LagrangeInterpolation(mclBnG1 *out, const mclBnFr *xVec, const mclBnG1 *yVec, mclSize k)
 	try
 {
 	mcl::LagrangeInterpolation(*cast(out), cast(xVec), cast(yVec), k);
@@ -552,7 +552,7 @@ int mclBn_G1LagrangeInterpolation(mclBnG1 *out, const mclBnFr *xVec, const mclBn
 	if (g_fp) fprintf(g_fp, "mclBn_G1LagrangeInterpolation %s\n", e.what());
 	return -1;
 }
-int mclBn_G2LagrangeInterpolation(mclBnG2 *out, const mclBnFr *xVec, const mclBnG2 *yVec, size_t k)
+int mclBn_G2LagrangeInterpolation(mclBnG2 *out, const mclBnFr *xVec, const mclBnG2 *yVec, mclSize k)
 	try
 {
 	mcl::LagrangeInterpolation(*cast(out), cast(xVec), cast(yVec), k);
@@ -561,7 +561,7 @@ int mclBn_G2LagrangeInterpolation(mclBnG2 *out, const mclBnFr *xVec, const mclBn
 	if (g_fp) fprintf(g_fp, "mclBn_G2LagrangeInterpolation %s\n", e.what());
 	return -1;
 }
-int mclBn_FrEvaluatePolynomial(mclBnFr *out, const mclBnFr *cVec, size_t cSize, const mclBnFr *x)
+int mclBn_FrEvaluatePolynomial(mclBnFr *out, const mclBnFr *cVec, mclSize cSize, const mclBnFr *x)
 	try
 {
 	mcl::evaluatePolynomial(*cast(out), cast(cVec), cSize, *cast(x));
@@ -570,7 +570,7 @@ int mclBn_FrEvaluatePolynomial(mclBnFr *out, const mclBnFr *cVec, size_t cSize,
 	if (g_fp) fprintf(g_fp, "mclBn_FrEvaluatePolynomial %s\n", e.what());
 	return -1;
 }
-int mclBn_G1EvaluatePolynomial(mclBnG1 *out, const mclBnG1 *cVec, size_t cSize, const mclBnFr *x)
+int mclBn_G1EvaluatePolynomial(mclBnG1 *out, const mclBnG1 *cVec, mclSize cSize, const mclBnFr *x)
 	try
 {
 	mcl::evaluatePolynomial(*cast(out), cast(cVec), cSize, *cast(x));
@@ -579,7 +579,7 @@ int mclBn_G1EvaluatePolynomial(mclBnG1 *out, const mclBnG1 *cVec, size_t cSize,
 	if (g_fp) fprintf(g_fp, "mclBn_G1EvaluatePolynomial %s\n", e.what());
 	return -1;
 }
-int mclBn_G2EvaluatePolynomial(mclBnG2 *out, const mclBnG2 *cVec, size_t cSize, const mclBnFr *x)
+int mclBn_G2EvaluatePolynomial(mclBnG2 *out, const mclBnG2 *cVec, mclSize cSize, const mclBnFr *x)
 	try
 {
 	mcl::evaluatePolynomial(*cast(out), cast(cVec), cSize, *cast(x));