Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
d612ab7d
Y
YTBP
项目概览
YottaChain
/
YTBP
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
YTBP
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
d612ab7d
编写于
10月 07, 2018
作者:
M
Matt Witherspoon
提交者:
GitHub
10月 07, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5886 from EOSIO/macos_proper_https
On macOS populate root CAs via system cert store
上级
8f13ff32
83e81af3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
9 deletion
+4
-9
CMakeLists.txt
CMakeLists.txt
+1
-0
libraries/fc
libraries/fc
+1
-1
programs/cleos/httpc.cpp
programs/cleos/httpc.cpp
+2
-8
未找到文件。
CMakeLists.txt
浏览文件 @
d612ab7d
...
...
@@ -238,6 +238,7 @@ install(FILES libraries/softfloat/COPYING.txt DESTINATION ${CMAKE_INSTALL_FULL_D
install
(
FILES libraries/wasm-jit/LICENSE DESTINATION
${
CMAKE_INSTALL_FULL_DATAROOTDIR
}
/licenses/eosio/ RENAME LICENSE.wavm
)
install
(
FILES libraries/fc/secp256k1/upstream/COPYING DESTINATION
${
CMAKE_INSTALL_FULL_DATAROOTDIR
}
/licenses/eosio/ RENAME LICENSE.secp256k1
)
install
(
FILES externals/binaryen/LICENSE DESTINATION
${
CMAKE_INSTALL_FULL_DATAROOTDIR
}
/licenses/eosio/ RENAME LICENSE.binaryen
)
install
(
FILES libraries/fc/src/network/LICENSE.go DESTINATION
${
CMAKE_INSTALL_FULL_DATAROOTDIR
}
/licenses/eosio/
)
include
(
installer
)
...
...
fc
@
29cd7df7
比较
b27ff7d4
...
29cd7df7
Subproject commit
b27ff7d4a96cc7bd53485758cfb71e841721be00
Subproject commit
29cd7df702e79954076461af0eadad2e9d745d44
programs/cleos/httpc.cpp
浏览文件 @
d612ab7d
...
...
@@ -18,6 +18,7 @@
#include <boost/asio/ssl.hpp>
#include <fc/variant.hpp>
#include <fc/io/json.hpp>
#include <fc/network/platform_root_ca.hpp>
#include <eosio/chain/exceptions.hpp>
#include <eosio/http_plugin/http_plugin.hpp>
#include <eosio/chain_plugin/chain_plugin.hpp>
...
...
@@ -230,14 +231,7 @@ namespace eosio { namespace client { namespace http {
}
else
{
//https
boost
::
asio
::
ssl
::
context
ssl_context
(
boost
::
asio
::
ssl
::
context
::
sslv23_client
);
#if defined( __APPLE__ )
//TODO: this is undocumented/not supported; fix with keychain based approach
ssl_context
.
load_verify_file
(
"/private/etc/ssl/cert.pem"
);
#elif defined( _WIN32 )
EOS_THROW
(
http_exception
,
"HTTPS on Windows not supported"
);
#else
ssl_context
.
set_default_verify_paths
();
#endif
fc
::
add_platform_root_cas_to_context
(
ssl_context
);
boost
::
asio
::
ssl
::
stream
<
boost
::
asio
::
ip
::
tcp
::
socket
>
socket
(
cp
.
context
->
ios
,
ssl_context
);
SSL_set_tlsext_host_name
(
socket
.
native_handle
(),
url
.
server
.
c_str
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录