mirror of
https://github.com/cygnusxi/CurecoinSource.git
synced 2025-07-28 08:04:42 +02:00
Merge pull request #31 from mthalmei/boost-1.66
fix build with boost 1.66
This commit is contained in:
commit
f570a26929
@ -2,7 +2,7 @@ TEMPLATE = app
|
||||
TARGET = curecoin-qt
|
||||
VERSION = 1.9.5.1
|
||||
INCLUDEPATH += src src/json src/qt
|
||||
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
|
||||
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN BOOST_ASIO_ENABLE_OLD_SERVICES __NO_SYSTEM_INCLUDES
|
||||
CONFIG += no_include_pwd
|
||||
QT += core gui network
|
||||
|
||||
|
@ -757,7 +757,7 @@ void ThreadRPCServer2(void* parg)
|
||||
|
||||
asio::io_service io_service;
|
||||
|
||||
ssl::context context(io_service, ssl::context::sslv23);
|
||||
ssl::context context(ssl::context::sslv23);
|
||||
if (fUseSSL)
|
||||
{
|
||||
context.set_options(ssl::context::no_sslv2);
|
||||
@ -773,7 +773,7 @@ void ThreadRPCServer2(void* parg)
|
||||
else printf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string().c_str());
|
||||
|
||||
string strCiphers = GetArg("-rpcsslciphers", "TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH");
|
||||
SSL_CTX_set_cipher_list(context.impl(), strCiphers.c_str());
|
||||
SSL_CTX_set_cipher_list(context.native_handle(), strCiphers.c_str());
|
||||
}
|
||||
|
||||
// Try a dual IPv6/IPv4 socket, falling back to separate IPv4 and IPv6 sockets
|
||||
@ -1067,7 +1067,7 @@ Object CallRPC(const string& strMethod, const Array& params)
|
||||
// Connect to localhost
|
||||
bool fUseSSL = GetBoolArg("-rpcssl");
|
||||
asio::io_service io_service;
|
||||
ssl::context context(io_service, ssl::context::sslv23);
|
||||
ssl::context context(ssl::context::sslv23);
|
||||
context.set_options(ssl::context::no_sslv2);
|
||||
asio::ssl::stream<asio::ip::tcp::socket> sslStream(io_service, context);
|
||||
SSLIOStreamDevice<asio::ip::tcp> d(sslStream, fUseSSL);
|
||||
|
Loading…
x
Reference in New Issue
Block a user