rename C interface library

5 files changed, 14 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 7516641..87d5645 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@ LIB_DIR=lib
 OBJ_DIR=obj
 EXE_DIR=bin
 SRC_SRC=fp.cpp
-TEST_SRC=fp_test.cpp ec_test.cpp fp_util_test.cpp window_method_test.cpp elgamal_test.cpp fp_tower_test.cpp gmp_test.cpp bn_test.cpp bn_if256_test.cpp bn_if384_test.cpp bn384_test.cpp glv_test.cpp pailler_test.cpp
+TEST_SRC=fp_test.cpp ec_test.cpp fp_util_test.cpp window_method_test.cpp elgamal_test.cpp fp_tower_test.cpp gmp_test.cpp bn_test.cpp bn384_test.cpp glv_test.cpp pailler_test.cpp
+TEST_SRC+=bn_c256_test.cpp bn_c384_test.cpp
 ifeq ($(CPU),x86-64)
   MCL_USE_XBYAK?=1
   TEST_SRC+=mont_fp_test.cpp sq_test.cpp
@@ -26,10 +27,10 @@ SHARE_BASENAME_SUF?=_dy
 ##################################################################
 MCL_LIB=$(LIB_DIR)/libmcl.a
 MCL_SLIB=$(LIB_DIR)/libmcl$(SHARE_BASENAME_SUF).$(LIB_SUF)
-BN256_LIB=$(LIB_DIR)/libbn_if256.a
-BN256_SLIB=$(LIB_DIR)/libbn_if256$(SHARE_BASENAME_SUF).$(LIB_SUF)
-BN384_LIB=$(LIB_DIR)/libbn_if384.a
-BN384_SLIB=$(LIB_DIR)/libbn_if384$(SHARE_BASENAME_SUF).$(LIB_SUF)
+BN256_LIB=$(LIB_DIR)/libmclbn256.a
+BN256_SLIB=$(LIB_DIR)/libmclbn256$(SHARE_BASENAME_SUF).$(LIB_SUF)
+BN384_LIB=$(LIB_DIR)/libmclbn384.a
+BN384_SLIB=$(LIB_DIR)/libmclbn384$(SHARE_BASENAME_SUF).$(LIB_SUF)
 all: $(MCL_LIB) $(MCL_SLIB) $(BN256_LIB) $(BN256_SLIB) $(BN384_LIB) $(BN384_SLIB)
 
 #LLVM_VER=-3.8
@@ -46,8 +47,8 @@ ifneq ($(CPU),)
 endif
 ASM_OBJ=$(OBJ_DIR)/$(CPU).o
 LIB_OBJ=$(OBJ_DIR)/fp.o
-BN256_OBJ=$(OBJ_DIR)/bn_if256.o
-BN384_OBJ=$(OBJ_DIR)/bn_if384.o
+BN256_OBJ=$(OBJ_DIR)/bn_c256.o
+BN384_OBJ=$(OBJ_DIR)/bn_c384.o
 FUNC_LIST=src/func.list
 MCL_USE_LLVM?=1
 ifeq ($(MCL_USE_LLVM),1)
@@ -95,7 +96,7 @@ $(BN256_LIB): $(LIB_OBJ) $(BN256_OBJ)
 $(BN256_SLIB): $(LIB_OBJ) $(BN256_OBJ)
 	$(PRE)$(CXX) -o $@ $(LIB_OBJ) $(BN256_OBJ) -shared
 
-$(BN256_OBJ): src/bn_if.cpp
+$(BN256_OBJ): src/bn_c.cpp
 	$(PRE)$(CXX) -c $< -o $@ $(CFLAGS) -DBN_MAX_OP_UNIT_SIZE=4
 
 $(BN384_LIB): $(LIB_OBJ) $(BN384_OBJ)
@@ -104,7 +105,7 @@ $(BN384_LIB): $(LIB_OBJ) $(BN384_OBJ)
 $(BN384_SLIB): $(LIB_OBJ) $(BN384_OBJ)
 	$(PRE)$(CXX) -o $@ $(LIB_OBJ) $(BN384_OBJ) -shared
 
-$(BN384_OBJ): src/bn_if.cpp
+$(BN384_OBJ): src/bn_c.cpp
 	$(PRE)$(CXX) -c $< -o $@ $(CFLAGS) -DBN_MAX_OP_UNIT_SIZE=6
 
 $(ASM_OBJ): $(ASM_SRC)
@@ -157,10 +158,10 @@ $(OBJ_DIR)/%.o: %.c
 $(EXE_DIR)/%.exe: $(OBJ_DIR)/%.o $(MCL_LIB)
 	$(PRE)$(CXX) $< -o $@ $(MCL_LIB) $(LDFLAGS)
 
-$(EXE_DIR)/bn_if256_test.exe: $(OBJ_DIR)/bn_if256_test.o $(BN256_LIB)
+$(EXE_DIR)/bn_c256_test.exe: $(OBJ_DIR)/bn_c256_test.o $(BN256_LIB)
 	$(PRE)$(CXX) $< -o $@ $(BN256_LIB) $(LDFLAGS)
 
-$(EXE_DIR)/bn_if384_test.exe: $(OBJ_DIR)/bn_if384_test.o $(BN384_LIB)
+$(EXE_DIR)/bn_c384_test.exe: $(OBJ_DIR)/bn_c384_test.o $(BN384_LIB)
 	$(PRE)$(CXX) $< -o $@ $(BN384_LIB) $(LDFLAGS)
 
 $(EXE_DIR)/pairing_c.exe: $(OBJ_DIR)/pairing_c.o $(BN256_LIB)
diff --git a/src/bn_if.cpp b/src/bn_c.cpp
index e7c7f10..e7c7f10 100644
--- a/src/bn_if.cpp
+++ b/src/bn_c.cpp
diff --git a/test/bn_if256_test.cpp b/test/bn_c256_test.cpp
index f8f2b78..2991d95 100644
--- a/test/bn_if256_test.cpp
+++ b/test/bn_c256_test.cpp
@@ -2,5 +2,5 @@
 using namespace mcl::bn256;
 #define BN_DEFINE_STRUCT
 #define BN_MAX_OP_UNIT_SIZE 4
-#include "bn_if_test.hpp"
+#include "bn_c_test.hpp"
 
diff --git a/test/bn_if384_test.cpp b/test/bn_c384_test.cpp
index 5795629..c9b6376 100644
--- a/test/bn_if384_test.cpp
+++ b/test/bn_c384_test.cpp
@@ -2,5 +2,5 @@
 using namespace mcl::bn384;
 #define BN_DEFINE_STRUCT
 #define BN_MAX_OP_UNIT_SIZE 6
-#include "bn_if_test.hpp"
+#include "bn_c_test.hpp"
 
diff --git a/test/bn_if_test.hpp b/test/bn_c_test.hpp
index 4168097..4168097 100644
--- a/test/bn_if_test.hpp
+++ b/test/bn_c_test.hpp