Merge pull request #14 from JUZIX-DEV/master

modification for paillier typo
bcosorg · Aug 4, 2017 · ea2d7d5 · ea2d7d5
2 parents e9c72e8 + 7ec0db2
commit ea2d7d5
Show file tree

Hide file tree

Showing 39 changed files with 6,640 additions and 5,500 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,7 +63,7 @@ add_subdirectory(libcontract)
 add_subdirectory(libsinglepoint)
 add_subdirectory(libpbftseal)
 add_subdirectory(libraftseal)
-add_subdirectory(libpailler)
+add_subdirectory(libpaillier)
 add_subdirectory(libethcore)
 add_subdirectory(libethereum)
 add_subdirectory(libevm)

diff --git a/doc/manual/manual.md b/doc/manual/manual.md
@@ -629,11 +629,11 @@ uploadFile(fileInfo, file);//上传文件，等待回调upload_file_back
 
 ## 3.3 加法同态接口使用说明
 对本版本所提供的加法同态运算功能，提供如下使用说明：
-1.Java的API实现的同态加密算法，可以完成对需要运算的数据完成加解密操作,相关的代码工程路径为：{git_root}\tool\java\Pailler;
+1.Java的API实现的同态加密算法，可以完成对需要运算的数据完成加解密操作,相关的代码工程路径为：{git_root}\tool\java\Paillier;
 
 2.Solidity合约语言提供一个Library，实现对两个加密后数据实现加法同态运算，相关的合约路径为：{git_root}\systemcontractv2\LibPaillier.sol;
 
-3.提供C语言同态加法算法实现，最终开放接口为智能合约同态加法运算API，相关代码路径为：{git_root}\libpailler;
+3.提供C语言同态加法算法实现，最终开放接口为智能合约同态加法运算API，相关代码路径为：{git_root}\libpaillier;
 
 4.扩展VM中的sha3指令用以支持合约与C代码底层能力的桥接和适配，相关代码路径为：{git_root}\libevm.
 

diff --git a/libevm/CMakeLists.txt b/libevm/CMakeLists.txt
@@ -33,7 +33,7 @@ include_directories(../libodbc/include
 					../libodbc/include/sqllite
 					../libodbc/include/ss_linux
 					../libodbc/include/sybase
-					../libpailler)
+					../libpaillier)
 
 
 target_link_libraries(evm ${Eth_ETHCORE_LIBRARIES})

diff --git a/libevm/VMExtends.cpp b/libevm/VMExtends.cpp
@@ -6,7 +6,7 @@
 #include <arpa/inet.h>
 #include "VMExtends.h"
 #include <boost/algorithm/string.hpp>
-#include "pailler.h"
+#include "paillier.h"
 
 using namespace std;
 using namespace dev;

diff --git a/libpailler/CMakeLists.txt → libpaillier/CMakeLists.txt b/libpailler/CMakeLists.txt → libpaillier/CMakeLists.txt
@@ -1,7 +1,7 @@
-aux_source_directory(. SRC_LIST)
-
-file(GLOB HEADERS "*.h")
-
-add_library(pailler ${SRC_LIST} ${HEADERS})
-
+aux_source_directory(. SRC_LIST)
+
+file(GLOB HEADERS "*.h")
+
+add_library(pailler ${SRC_LIST} ${HEADERS})
+
 install(TARGETS pailler RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)