version v0.91

4 files changed, 46 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 7920d61..a35e6f2 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ TEST_SRC+=bn_c256_test.cpp bn_c384_test.cpp bn_c384_256_test.cpp bn_c512_test.cp
 TEST_SRC+=aggregate_sig_test.cpp array_test.cpp
 TEST_SRC+=bls12_test.cpp
 TEST_SRC+=ecdsa_c_test.cpp
+TEST_SRC+=modp_test.cpp
 ifeq ($(CPU),x86-64)
   MCL_USE_XBYAK?=1
   TEST_SRC+=mont_fp_test.cpp sq_test.cpp
@@ -265,6 +266,12 @@ $(EXE_DIR)/she_c384_test.exe: $(OBJ_DIR)/she_c384_test.o $(SHE384_LIB) $(MCL_LIB
 $(EXE_DIR)/ecdsa_c_test.exe: $(OBJ_DIR)/ecdsa_c_test.o $(ECDSA_LIB) $(MCL_LIB) src/ecdsa_c.cpp include/mcl/ecdsa.hpp include/mcl/ecdsa.h
 	$(PRE)$(CXX) $< -o $@ $(ECDSA_LIB) $(MCL_LIB) $(LDFLAGS)
 
+$(OBJ_DIR)/modp_test.o: test/modp_test.cpp
+	$(PRE)$(CXX) -c $< -o $@ -MMD -MP -MF $(@:.o=.d) -DMCL_USE_VINT -DMCL_MAX_BIT_SIZE=384 -DMCL_VINT_64BIT_PORTABLE -DMCL_SIZEOF_UNIT=8 -DMCL_VINT_FIXED_BUFFER -I./include -O2 $(CFLAGS_WARN)
+
+$(EXE_DIR)/modp_test.exe: $(OBJ_DIR)/modp_test.o
+	$(PRE)$(CXX) $< -o $@
+
 SAMPLE_EXE=$(addprefix $(EXE_DIR)/,$(addsuffix .exe,$(basename $(SAMPLE_SRC))))
 sample: $(SAMPLE_EXE) $(MCL_LIB)
 
diff --git a/include/mcl/op.hpp b/include/mcl/op.hpp
index 393319a..549d93b 100644
--- a/include/mcl/op.hpp
+++ b/include/mcl/op.hpp
@@ -26,7 +26,7 @@
 
 namespace mcl {
 
-static const int version = 0x090; /* 0xABC = A.BC */
+static const int version = 0x091; /* 0xABC = A.BC */
 
 /*
 	specifies available string format mode for X::setIoMode()
diff --git a/readme.md b/readme.md
index f3d3f65..bc96382 100644
--- a/readme.md
+++ b/readme.md
@@ -443,6 +443,7 @@ Y. Sakemi, Y. Nogami, K. Okeya, Y. Morikawa, CANS 2008.
 

 # History

 

+* 2019/Mar/14 v0.91 modp supports mcl-wasm

 * 2019/Mar/12 v0.90 fix Vint::setArray(x) for x == this

 * 2019/Mar/07 add mclBnFr_setLittleEndianMod, mclBnFp_setLittleEndianMod

 * 2019/Feb/20 LagrangeInterpolation sets out = yVec[0] if k = 1

diff --git a/test/modp_test.cpp b/test/modp_test.cpp
new file mode 100644
index 0000000..bf9da38
--- /dev/null
+++ b/test/modp_test.cpp
@@ -0,0 +1,37 @@
+#include <mcl/gmp_util.hpp>
+#include <cybozu/benchmark.hpp>
+#include <cybozu/test.hpp>
+
+#define PUT(x) std::cout << #x << "=" << x << std::endl;
+
+CYBOZU_TEST_AUTO(modp)
+{
+	const int C = 1000000;
+	const char *pTbl[] = {
+		"0x2523648240000001ba344d8000000007ff9f800000000010a10000000000000d",
+		"0x1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab",
+		"0x73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001",
+	};
+	const char *xTbl[] = {
+		"0x12345678892082039482094823",
+		"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"0x10000000000000000000000000000000000000000000000000000000000000000",
+		"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+	};
+	mcl::Modp modp;
+	for (size_t i = 0; i < CYBOZU_NUM_OF_ARRAY(pTbl); i++) {
+		const mpz_class p(pTbl[i]);
+		std::cout << std::hex << "p=" << p << std::endl;
+		modp.init(p);
+		for (size_t j = 0; j < CYBOZU_NUM_OF_ARRAY(xTbl); j++) {
+			const mpz_class x(xTbl[j]);
+			std::cout << std::hex << "x=" << x << std::endl;
+			mpz_class r1, r2;
+			r1 = x % p;
+			modp.modp(r2, x);
+			CYBOZU_TEST_EQUAL(r1, r2);
+			CYBOZU_BENCH_C("x % p", C, mcl::gmp::mod, r1, x, p);
+			CYBOZU_BENCH_C("modp ", C, modp.modp, r2, x);
+		}
+	}
+}