rename constant value name Bls*** to bls***

4 files changed, 25 insertions, 23 deletions

diff --git a/include/bls_if.h b/include/bls_if.h
index 5b718f0..f8d174d 100644
--- a/include/bls_if.h
+++ b/include/bls_if.h
@@ -18,8 +18,10 @@
 #define BLS256_DLL_API __declspec(dllexport)
 #else
 #define BLS256_DLL_API __declspec(dllimport)
-#ifndef MCL_NO_AUTOLINK
-	#pragma comment(lib, "bls_if.lib")
+#ifndef BLS_NO_AUTOLINK
+	#if BLS_MAX_OP_UNIT_SIZE == 4
+		#pragma comment(lib, "bls_if256.lib")
+	#endif
 #endif
 #endif
 #else
@@ -31,17 +33,17 @@ extern "C" {
 #endif
 
 enum {
-	BlsCurveFp254BNb = 0,
-	BlsCurveFp382_1 = 1,
-	BlsCurveFp382_2 = 2
+	blsCurveFp254BNb = 0,
+	blsCurveFp382_1 = 1,
+	blsCurveFp382_2 = 2
 };
 
 // same value with bls.hpp
 enum {
-	BlsIoBin = 2, // binary number
-	BlsIoDec = 10, // decimal number
-	BlsIoHex = 16, // hexadecimal number
-	BlsIoEcComp = 512 // fixed byte representation
+	blsIoBin = 2, // binary number
+	blsIoDec = 10, // decimal number
+	blsIoHex = 16, // hexadecimal number
+	blsIoEcComp = 512 // fixed byte representation
 };
 
 typedef struct {
diff --git a/mklib.bat b/mklib.bat
index ff7494a..37f7c21 100644
--- a/mklib.bat
+++ b/mklib.bat
@@ -3,8 +3,8 @@ call setvar.bat
 echo make bls.lib
 cl /c %CFLAGS% src\bls.cpp
 lib /OUT:lib\bls.lib /nodefaultlib bls.obj %LDFLAGS%
-echo make lib_if.lib
-cl /c %CFLAGS% src\bls_if.cpp
-lib /OUT:lib\bls_if.lib /nodefaultlib bls_if.obj %LDFLAGS%
+rem echo make lib_if.lib
+rem cl /c %CFLAGS% src\bls_if.cpp
+rem lib /OUT:lib\bls_if.lib /nodefaultlib bls_if.obj %LDFLAGS%
 echo make bls256.dll
-link /nologo /DLL /OUT:bin\bls256.dll bls.obj bls_if.obj %LDFLAGS% /implib:lib\mcl256.lib
+link /nologo /DLL /OUT:bin\bls_if256.dll bls.obj bls_if.obj %LDFLAGS% /implib:lib\bls_if256.lib
diff --git a/src/bls_if.cpp b/src/bls_if.cpp
index 46382da..a9aec44 100644
--- a/src/bls_if.cpp
+++ b/src/bls_if.cpp
@@ -42,7 +42,7 @@ size_t getStrT(const Outer *p, char *buf, size_t maxBufSize, int ioMode)
 	std::string s;
 	((const Inner*)p)->getStr(s, ioMode);
 	size_t terminate = 0;
-	if (ioMode == 0 || ioMode == BlsIoBin || ioMode == BlsIoDec || ioMode == BlsIoHex) {
+	if (ioMode == 0 || ioMode == blsIoBin || ioMode == blsIoDec || ioMode == blsIoHex) {
 		terminate = 1; // for '\0'
 	}
 	if (s.size() > maxBufSize + terminate) {
diff --git a/test/bls_if_test.cpp b/test/bls_if_test.cpp
index 32a9f4e..8e5c4b1 100644
--- a/test/bls_if_test.cpp
+++ b/test/bls_if_test.cpp
@@ -59,23 +59,23 @@ void bls_ifDataTest()
 	char buf[BLS_MAX_OP_UNIT_SIZE * sizeof(uint64_t) * 2];
 	size_t n;
 	int ret;
-	n = blsSecretKeyGetStr(&sec1, buf, sizeof(buf), BlsIoEcComp);
+	n = blsSecretKeyGetStr(&sec1, buf, sizeof(buf), blsIoEcComp);
 	CYBOZU_TEST_EQUAL(n, fpSize);
-	ret = blsSecretKeySetStr(&sec2, buf, n, BlsIoEcComp);
+	ret = blsSecretKeySetStr(&sec2, buf, n, blsIoEcComp);
 	CYBOZU_TEST_EQUAL(ret, 0);
 	CYBOZU_TEST_ASSERT(blsSecretKeyIsSame(&sec1, &sec2));
 	blsPublicKey pub1, pub2;
 	blsSecretKeyGetPublicKey(&sec1, &pub1);
-	n = blsPublicKeyGetStr(&pub1, buf, sizeof(buf), BlsIoEcComp);
+	n = blsPublicKeyGetStr(&pub1, buf, sizeof(buf), blsIoEcComp);
 	CYBOZU_TEST_EQUAL(n, fpSize * 2);
-	ret = blsPublicKeySetStr(&pub2, buf, n, BlsIoEcComp);
+	ret = blsPublicKeySetStr(&pub2, buf, n, blsIoEcComp);
 	CYBOZU_TEST_EQUAL(ret, 0);
 	CYBOZU_TEST_ASSERT(blsPublicKeyIsSame(&pub1, &pub2));
 	blsSign sign1, sign2;
 	blsSecretKeySign(&sec1, &sign1, msg, msgSize);
-	n = blsSignGetStr(&sign1, buf, sizeof(buf), BlsIoEcComp);
+	n = blsSignGetStr(&sign1, buf, sizeof(buf), blsIoEcComp);
 	CYBOZU_TEST_EQUAL(n, fpSize);
-	ret = blsSignSetStr(&sign2, buf, n, BlsIoEcComp);
+	ret = blsSignSetStr(&sign2, buf, n, blsIoEcComp);
 	CYBOZU_TEST_EQUAL(ret, 0);
 	CYBOZU_TEST_ASSERT(blsSignIsSame(&sign1, &sign2));
 }
@@ -95,10 +95,10 @@ void bls_ifOrderTest(const char *curveOrder, const char *fieldOrder)
 CYBOZU_TEST_AUTO(all)
 {
 	const int tbl[] = {
-		BlsCurveFp254BNb,
+		blsCurveFp254BNb,
 #if BLS_MAX_OP_UNIT_SIZE == 6
-		BlsCurveFp382_1,
-		BlsCurveFp382_2
+		blsCurveFp382_1,
+		blsCurveFp382_2
 #endif
 	};
 	const char *curveOrderTbl[] = {