Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

On macOS populate root CAs via system cert store #5886

Merged
merged 2 commits into from
Oct 8, 2018
Merged

On macOS populate root CAs via system cert store #5886

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fbb512
On macOS populate root CAs via system cert store
spoonincode Oct 2, 2018
83e81af
Merge remote-tracking branch 'origin/develop' into macos_proper_https
spoonincode Oct 8, 2018
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion libraries/fc
Open in desktop
Submodule fc updated 5 files
+7 −1 CMakeLists.txt
+13 −0 include/fc/network/platform_root_ca.hpp
+27 −0 src/network/LICENSE.go
+2 −0 src/network/http/http_client.cpp
+123 −0 src/network/platform_root_ca.cpp
10 changes: 2 additions & 8 deletions programs/cleos/httpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -229,14 +230,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());
Expand Down