diff options
| author | MITSUNARI Shigeo <herumi@nifty.com> | 2017-05-31 16:19:50 +0800 |
|---|---|---|
| committer | MITSUNARI Shigeo <herumi@nifty.com> | 2017-05-31 16:19:50 +0800 |
| commit | 659e67ec5eee1623387f25325a82f27faa4e6a85 (patch) | |
| tree | 6fc125731f1b54f4ab709f28db6069ace1b796e3 | |
| parent | c03f944f1ac0f4c85f262caeb931e2b08ed357e0 (diff) | |
| download | tangerine-mcl-659e67ec5eee1623387f25325a82f27faa4e6a85.tar.gz tangerine-mcl-659e67ec5eee1623387f25325a82f27faa4e6a85.tar.zst tangerine-mcl-659e67ec5eee1623387f25325a82f27faa4e6a85.zip | |
rename BN_init to BN_initLib
| -rw-r--r-- | include/mcl/bn_if.h | 3 | ||||
| -rw-r--r-- | mklib.bat | 8 | ||||
| -rw-r--r-- | src/bn_if.cpp | 8 | ||||
| -rw-r--r-- | test/bn_if256_test.cpp | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/include/mcl/bn_if.h b/include/mcl/bn_if.h index e8a946c..cc9645f 100644 --- a/include/mcl/bn_if.h +++ b/include/mcl/bn_if.h @@ -83,8 +83,9 @@ enum { curve = BN_CurveFp254BNb is allowed if maxUnitSize = 4 curve = BN_CurveFp254BNb/BN_CurveFp382_1/BN_CurveFp382_2 are allowed if maxUnitSize = 6 @note not threadsafe + @note BN_init is used in libeay32 */ -BN_DLL_API int BN_init(int curve, int maxUnitSize); +BN_DLL_API int BN_initLib(int curve, int maxUnitSize); //////////////////////////////////////////////// // set zero @@ -8,7 +8,7 @@ cl /c %CFLAGS% src\fp.cpp /Foobj\fp.obj echo lib /nologo /OUT:lib\mcl.lib /nodefaultlib obj\fp.obj lib /nologo /OUT:lib\mcl.lib /nodefaultlib obj\fp.obj -echo cl /c %CFLAGS% src\bn256.cpp /Foobj\bn256.obj -cl /c %CFLAGS% src\bn256.cpp /Foobj\bn256.obj -echo link /nologo /DLL /OUT:bin\bn256.dll obj\bn256.obj obj\fp.obj %LDFLAGS% /implib:lib\bn256.lib -link /nologo /DLL /OUT:bin\bn256.dll obj\bn256.obj obj\fp.obj %LDFLAGS% /implib:lib\bn256.lib +echo cl /c %CFLAGS% src\bn_if.cpp /Foobj\bn_if256.obj /DBLS_MAX_OP_UNIT_SIZE=4 +cl /c %CFLAGS% src\bn_if.cpp /Foobj\bn_if256.obj /DBLS_MAX_OP_UNIT_SIZE=4 +echo link /nologo /DLL /OUT:bin\bn_if256.dll obj\bn_if256.obj obj\fp.obj %LDFLAGS% /implib:lib\bn_if256.lib +link /nologo /DLL /OUT:bin\bn_if256.dll obj\bn_if256.obj obj\fp.obj %LDFLAGS% /implib:lib\bn_if256.lib diff --git a/src/bn_if.cpp b/src/bn_if.cpp index 3302619..1f35785 100644 --- a/src/bn_if.cpp +++ b/src/bn_if.cpp @@ -70,7 +70,7 @@ size_t serialize(void *buf, size_t maxBufSize, const T *x, int ioMode, const cha } template<class T> -size_t deserialize(T *x, const void *buf, size_t bufSize, int ioMode, const char *msg, bool convertFromHex) +int deserialize(T *x, const void *buf, size_t bufSize, int ioMode, const char *msg, bool convertFromHex) try { std::string str; @@ -105,11 +105,11 @@ int BN_setErrFile(const char *name) #endif } -int BN_init(int curve, int maxUnitSize) +int BN_initLib(int curve, int maxUnitSize) try { if (maxUnitSize != BN_MAX_FP_UNIT_SIZE) { - if (g_fp) fprintf(g_fp, "BN_Init:maxUnitSize is mismatch %d %d\n", maxUnitSize, BN_MAX_FP_UNIT_SIZE); + if (g_fp) fprintf(g_fp, "BN_initLib:maxUnitSize is mismatch %d %d\n", maxUnitSize, BN_MAX_FP_UNIT_SIZE); return -1; } mcl::bn::CurveParam cp; @@ -126,7 +126,7 @@ int BN_init(int curve, int maxUnitSize) break; #endif default: - if (g_fp) fprintf(g_fp, "BN_Init:not supported curve %d\n", curve); + if (g_fp) fprintf(g_fp, "BN_initLib:not supported curve %d\n", curve); return -1; } #if BN_MAX_FP_UNIT_SIZE == 4 diff --git a/test/bn_if256_test.cpp b/test/bn_if256_test.cpp index 45690fb..7ef7f2b 100644 --- a/test/bn_if256_test.cpp +++ b/test/bn_if256_test.cpp @@ -31,7 +31,7 @@ CYBOZU_TEST_AUTO(init) ret = BN_setErrFile("stderr"); CYBOZU_TEST_EQUAL(ret, 0); - ret = BN_init(BN_curveFp254BNb, BN_MAX_FP_UNIT_SIZE); + ret = BN_initLib(BN_curveFp254BNb, BN_MAX_FP_UNIT_SIZE); CYBOZU_TEST_EQUAL(ret, 0); } |