fixed build for gcc 4.6 and boost 1.46

This commit is contained in:
orignal 2015-11-06 09:01:02 -05:00
parent d50ba1259c
commit 73037b86ac
2 changed files with 3 additions and 2 deletions

View file

@ -372,7 +372,7 @@ namespace data
boost::asio::ip::tcp::resolver::query (u.host_, std::to_string (u.port_)), ecode); boost::asio::ip::tcp::resolver::query (u.host_, std::to_string (u.port_)), ecode);
if (!ecode) if (!ecode)
{ {
boost::asio::ssl::context ctx(service, boost::asio::ssl::context::tlsv12); boost::asio::ssl::context ctx(service, boost::asio::ssl::context::sslv23);
ctx.set_verify_mode(boost::asio::ssl::context::verify_none); ctx.set_verify_mode(boost::asio::ssl::context::verify_none);
boost::asio::ssl::stream<boost::asio::ip::tcp::socket> s(service, ctx); boost::asio::ssl::stream<boost::asio::ip::tcp::socket> s(service, ctx);
s.lowest_layer().connect (*it, ecode); s.lowest_layer().connect (*it, ecode);

View file

@ -138,7 +138,8 @@ namespace tunnel
hop = m_Config->GetLastHop (); hop = m_Config->GetLastHop ();
while (hop) while (hop)
{ {
auto tunnelHop = new TunnelHop{ .ident = hop->ident }; auto tunnelHop = new TunnelHop;
tunnelHop->ident = hop->ident;
tunnelHop->decryption.SetKeys (hop->layerKey, hop->ivKey); tunnelHop->decryption.SetKeys (hop->layerKey, hop->ivKey);
m_Hops.push_back (std::unique_ptr<TunnelHop>(tunnelHop)); m_Hops.push_back (std::unique_ptr<TunnelHop>(tunnelHop));
hop = hop->prev; hop = hop->prev;