some extra delete pailler

to delete pailler completely
FISCO-BCOS · Aug 4, 2017 · 982f872 · 982f872
1 parent d838a60
commit 982f872
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/libevm/CMakeLists.txt b/libevm/CMakeLists.txt
@@ -33,12 +33,12 @@ include_directories(../libodbc/include
 					../libodbc/include/sqllite
 					../libodbc/include/ss_linux
 					../libodbc/include/sybase
-					../libpailler)
+					../libpaillier)
 
 
 target_link_libraries(evm ${Eth_ETHCORE_LIBRARIES})
 target_link_libraries(evm ${Eth_EVMCORE_LIBRARIES})
-target_link_libraries(evm pailler)
+target_link_libraries(evm paillier)
 target_include_directories(evm PRIVATE .. ${JSONCPP_INCLUDE_DIR})
 
 if (EVMJIT)

diff --git a/libpaillier/CMakeLists.txt b/libpaillier/CMakeLists.txt
@@ -2,6 +2,6 @@ aux_source_directory(. SRC_LIST)
 
 file(GLOB HEADERS "*.h")
 
-add_library(pailler ${SRC_LIST} ${HEADERS})
+add_library(paillier ${SRC_LIST} ${HEADERS})
 
-install(TARGETS pailler RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 
+install(TARGETS paillier RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 
diff --git a/libpaillier/macro.h b/libpaillier/macro.h
@@ -17,7 +17,7 @@ extern "C"{
 #define Plus						0x00000000
 #define Minus						0x00000001
 
-//macro for BN in pailler
+//macro for BN in paillier
 #define PaiBNBitLen					1024
 #define PaiBNWordLen				32
 #define PaiPrimeWordLen				16

diff --git a/libpaillier/paillier.c b/libpaillier/paillier.c
@@ -1,4 +1,4 @@
-#include "pailler.h"
+#include "paillier.h"
 
 void PAI_HomAdd(U8 *pbBN_Result, U8 *pbBN_c1, U8 *pbBN_c2, U8 *pbBN_n, S32 iBNWordLen)
 {

diff --git a/tool/demoTestPaillie.js b/tool/demoTestPaillie.js
@@ -18,8 +18,8 @@ console.log(config);
 var filename="TestPaillier";
 var address=fs.readFileSync(config.Ouputpath+filename+'.address','utf-8');
 var abi=JSON.parse(fs.readFileSync(config.Ouputpath/*+filename+".sol:"*/+filename+'.abi', 'utf-8'));
-var paillierjson = fs.readFileSync('./java/Pailler/paillier.json', 'utf-8');
-var paillie=JSON.parse(fs.readFileSync('./java/Pailler/paillier.json', 'utf-8'));
+var paillierjson = fs.readFileSync('./java/Paillier/paillier.json', 'utf-8');
+var paillie=JSON.parse(fs.readFileSync('./java/Paillier/paillier.json', 'utf-8'));
 var contract = web3.eth.contract(abi);
 var instance = contract.at(address);