fixes for lokinet-bootstrap

* use schannel on windows platforms
* load ca bundle for non windows platforms
* use geteuid for detecting root user when finding default data dir
pull/1576/head
Jeff Becker 3 years ago
parent 3d87dbff91
commit c547cd0118
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -1,21 +0,0 @@
if(BUILD_STATIC_DEPS)
set(OPENSSL_ROOT_DIR ${CMAKE_BINARY_DIR}/static-deps)
set(OPENSSL_CRYPTO_LIBRARY ${OPENSSL_ROOT_DIR}/lib/libcrypto.a)
set(OPENSSL_INCLUDE_DIR ${OPENSSL_ROOT_DIR}/include)
else()
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(PC_OPENSSL QUIET openssl)
set(OPENSSL_CRYPTO_LIBRARY ${PC_OPENSSL_LIBRARIES})
set(OPENSSL_INCLUDE_DIR ${PC_OPENSSL_INCLUDE_DIRS})
endif()
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(OpenSSL DEFAULT_MSG
OPENSSL_CRYPTO_LIBRARY
OPENSSL_INCLUDE_DIR)
mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_CRYPTO_LIBRARY)

@ -16,6 +16,10 @@
#include <sstream>
#ifndef _WIN32
#include <openssl/x509.h>
#endif
namespace
{
int

@ -86,11 +86,9 @@ add_definitions(-D_GNU_SOURCE)
add_subdirectory(ngtcp2 EXCLUDE_FROM_ALL)
set(CPR_BUILD_TESTS OFF)
set(CPR_FORCE_OPENSSL_BACKEND ON)
if(OPENSSL_ROOT_DIR)
message("openssl root: ${OPENSSL_ROOT_DIR}")
message("openssl headers: ${OPENSSL_INCLUDE_DIR}")
message("openssl crypto library: ${OPENSSL_CRYPTO_LIBRARY}")
if(WIN32)
set(CPR_FORCE_WINSSL_BACKEND ON)
else()
set(CPR_FORCE_USE_SYSETM_CURL ON)
endif()
add_subdirectory(cpr EXCLUDE_FROM_ALL)

Loading…
Cancel
Save