GermanAirlines/GermanAirlinesVA-GAConnector
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mutate libs to use default system certs file

Browse Source
This commit is contained in:
Kilian Hofmann 2022-09-05 14:59:08 +02:00
parent b695f4cb6c
commit 3dce2ca488
4 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ixwebsocket/CMakeLists.txt
View File

@ -64,7 +64,6 @@ elseif(UNIX)
target_compile_definitions(ixwebsocket PRIVATE target_compile_definitions(ixwebsocket PRIVATE
IXWEBSOCKET_USE_TLS IXWEBSOCKET_USE_TLS
IXWEBSOCKET_USE_OPEN_SSL IXWEBSOCKET_USE_OPEN_SSL
IXWEBSOCKET_OPEN_SSL_CERTS="/etc/ssl/certs/"
) )
target_compile_options(ixwebsocket PRIVATE target_compile_options(ixwebsocket PRIVATE
-nodefaultlibs -nodefaultlibs
@ -95,7 +94,6 @@ elseif(WIN32)
target_compile_definitions(ixwebsocket PRIVATE target_compile_definitions(ixwebsocket PRIVATE
IXWEBSOCKET_USE_TLS IXWEBSOCKET_USE_TLS
IXWEBSOCKET_USE_OPEN_SSL IXWEBSOCKET_USE_OPEN_SSL
IXWEBSOCKET_OPEN_SSL_CERTS=NULL
) )
if(DEBUG) if(DEBUG)
target_compile_options(ixwebsocket PRIVATE target_compile_options(ixwebsocket PRIVATE

2
ixwebsocket/IXSocketOpenSSL.cpp
View File

@ -506,7 +506,7 @@ namespace ix
else else
{ {
if (SSL_CTX_load_verify_locations( if (SSL_CTX_load_verify_locations(
_ssl_context, _tlsOptions.caFile.c_str(), IXWEBSOCKET_OPEN_SSL_CERTS) != 1) _ssl_context, _tlsOptions.caFile.c_str(), NULL) != 1)
{ {
auto sslErr = ERR_get_error(); auto sslErr = ERR_get_error();
errMsg = "OpenSSL failed - SSL_CTX_load_verify_locations(\"" + errMsg = "OpenSSL failed - SSL_CTX_load_verify_locations(\"" +

BIN
openSSL/lin32/libcrypto.so.1.1
View File

Binary file not shown.

BIN
openSSL/lin64/libcrypto.so.1.1
View File

Binary file not shown.