Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modification for paillier typo #14

Merged
merged 3 commits into from
Aug 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 2 additions & 14 deletions doc/manual/manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -481,18 +481,6 @@ JAVA SDK提供的接口功能包括文件上传,文件删除,文件下载,
|**输出参数**|**参数类型**|**参数说明**|
|NA|NA|NA|


- 接口名称:addServer
- 接口功能说明:添加文件服务器节点
- 参数说明

|输入参数|参数类型|参数说明|
|:-----|:-----|:-----|
|server|FileServer|文件服务节点信息|
|ret|int|返回值|
|**输出参数**|**参数类型**|**参数说明**|
|NA|NA|NA|

###### b. 删除文件服务器节点

- 接口名称:deleteServer
Expand Down Expand Up @@ -630,11 +618,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.

Expand Down
2 changes: 1 addition & 1 deletion libevm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion libevm/VMExtends.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions libpailler/CMakeLists.txt → libpaillier/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Loading