Skip to content

Commit

Permalink
Merge pull request #2 from ahmetalperenbulut/upgrade_TLS_version
Browse files Browse the repository at this point in the history
Upgrade TLS version
  • Loading branch information
alexdany657 authored Jun 19, 2020
2 parents fc603d0 + 0fd490d commit 8117e13
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
set(PROJECT_NAME "sioclient")
PROJECT(sioclient)

option(BUILD_SHARED_LIBS "Build the shared library" OFF)
Expand Down Expand Up @@ -71,14 +72,19 @@ list(APPEND TARGET_LIBRARIES sioclient_tls)

endif()


include(GNUInstallDirs)
include(CMakePackageConfigHelpers)


install(FILES ${ALL_HEADERS}
DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/include"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
)

install(TARGETS ${TARGET_LIBRARIES}
DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/lib/${CMAKE_BUILD_TYPE}"
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)

install(FILES ${Boost_LIBRARIES}
DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/lib/${CMAKE_BUILD_TYPE}"
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)
2 changes: 1 addition & 1 deletion src/internal/sio_client_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ namespace sio
#if SIO_TLS
client_impl::context_ptr client_impl::on_tls_init(connection_hdl conn)
{
context_ptr ctx = context_ptr(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv1));
context_ptr ctx = context_ptr(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv12));
boost::system::error_code ec;
ctx->set_options(boost::asio::ssl::context::default_workarounds |
boost::asio::ssl::context::no_sslv2 |
Expand Down

0 comments on commit 8117e13

Please sign in to comment.