From c547cd01184a2aae1ee81f1229acfc56479e65e0 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Thu, 15 Apr 2021 11:08:05 -0400
Subject: [PATCH] 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
---
 cmake/FindOpenSSL.cmake      | 21 ---------------------
 daemon/lokinet-bootstrap.cpp |  4 ++++
 external/CMakeLists.txt      | 10 ++++------
 3 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 cmake/FindOpenSSL.cmake

diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
deleted file mode 100644
index 6f092f99a..000000000
--- a/cmake/FindOpenSSL.cmake
+++ /dev/null
@@ -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)
diff --git a/daemon/lokinet-bootstrap.cpp b/daemon/lokinet-bootstrap.cpp
index 02472b466..7e8a4305a 100644
--- a/daemon/lokinet-bootstrap.cpp
+++ b/daemon/lokinet-bootstrap.cpp
@@ -16,6 +16,10 @@
 
 #include <sstream>
 
+#ifndef _WIN32
+#include <openssl/x509.h>
+#endif
+
 namespace
 {
   int
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index d6ff5c62d..065e51ad5 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -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)