Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +36
1 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 869c75d070 - Show all commits

36
src/network/http/websocket.cpp
View file

@ -20,6 +20,10 @@
#include <fc/thread/thread.hpp> #include <fc/thread/thread.hpp>
#include <fc/asio.hpp> #include <fc/asio.hpp>
#if WIN32
#include <wincrypt.h>
#endif
#ifdef DEFAULT_LOGGER #ifdef DEFAULT_LOGGER
# undef DEFAULT_LOGGER # undef DEFAULT_LOGGER
#endif #endif
@ -28,7 +32,33 @@
namespace fc { namespace http { namespace fc { namespace http {
namespace detail { namespace detail {
#if WIN32
// taken from https://stackoverflow.com/questions/39772878/reliable-way-to-get-root-ca-certificates-on-windows/40710806
static void add_windows_root_certs(boost::asio::ssl::context &ctx)
{
HCERTSTORE hStore = CertOpenSystemStore( 0, "ROOT" );
if( hStore == NULL )
return;
X509_STORE *store = X509_STORE_new();
PCCERT_CONTEXT pContext = NULL;
while( (pContext = CertEnumCertificatesInStore( hStore, pContext )) != NULL )
{
X509 *x509 = d2i_X509( NULL, (const unsigned char **)&pContext->pbCertEncoded,
pContext->cbCertEncoded);
if( x509 != NULL )
{
X509_STORE_add_cert( store, x509 );
X509_free( x509 );
}
}
CertFreeCertificateContext( pContext );
CertCloseStore( hStore, 0 );
SSL_CTX_set_cert_store( ctx.native_handle(), store );
}
#endif
struct asio_with_stub_log : public websocketpp::config::asio { struct asio_with_stub_log : public websocketpp::config::asio {
typedef asio_with_stub_log type; typedef asio_with_stub_log type;
@ -550,7 +580,13 @@ namespace fc { namespace http {
return; return;
ctx->set_verify_mode( boost::asio::ssl::verify_peer ); ctx->set_verify_mode( boost::asio::ssl::verify_peer );
if( ca_filename == "_default" ) if( ca_filename == "_default" )
{
#if WIN32
add_windows_root_certs( *ctx );
#else
ctx->set_default_verify_paths(); ctx->set_default_verify_paths();
#endif
}
else else
ctx->load_verify_file( ca_filename ); ctx->load_verify_file( ca_filename );
ctx->set_verify_depth(10); ctx->set_verify_depth(10);