rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6592 from symless/v1-issue-6556-tls 

Reverted static SSL libs and removed ifdef function macros
This commit is contained in:
Jnewbon 2019-11-07 13:55:54 +00:00 committed by GitHub
parent a7eaa7caa1 021229879b
commit 2849f76f31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -305,9 +305,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
${OPENSSL_ROOT}/lib/libcrypto.a ${OPENSSL_ROOT}/lib/libcrypto.a
) )
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(OPENSSL_USE_STATIC_LIBS TRUE) set (OPENSSL_LIBS ssl crypto)
find_package(OpenSSL REQUIRED)
set(OPENSSL_LIBS ${OPENSSL_LIBRARIES} pthread dl)
else() else()
message (FATAL_ERROR "Couldn't find OpenSSL") message (FATAL_ERROR "Couldn't find OpenSSL")
endif() endif()

2
src/cmd/synergyc/CMakeLists.txt
View File

@ -48,7 +48,7 @@ endif()
add_executable(synergyc ${sources}) add_executable(synergyc ${sources})
target_link_libraries(synergyc target_link_libraries(synergyc
arch base client common io mt net ipc platform server synlib ${OPENSSL_LIBS}) arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS})
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
install (TARGETS synergyc DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) install (TARGETS synergyc DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})

13
src/lib/net/SecureSocket.cpp
View File

@ -37,15 +37,6 @@
#define MAX_ERROR_SIZE 65535 #define MAX_ERROR_SIZE 65535
//Add the new function names in case older ones are deprecated
#if OPENSSL_VERSION_NUMBER > 0x10100000L
#define SSL_SERVER_METHOD TLS_server_method
#define SSL_CLIENT_METHOD TLS_client_method
#else
#define SSL_SERVER_METHOD SSLv23_server_method
#define SSL_CLIENT_METHOD SSLv23_server_method
#endif
static const float s_retryDelay = 0.01f; static const float s_retryDelay = 0.01f;
enum { enum {
@ -392,10 +383,10 @@ SecureSocket::initContext(bool server)
} }
if (server) { if (server) {
method = SSL_SERVER_METHOD(); method = SSLv23_server_method();
} }
else { else {
method = SSL_CLIENT_METHOD(); method = SSLv23_client_method();
} }
// create new context from method // create new context from method