diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb5bbf9cb..2873d4270 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -385,7 +385,6 @@ jobs: -DIMHEX_COMMIT_BRANCH="${GITHUB_REF##*/}" \ -DIMHEX_ENABLE_LTO=ON \ -DIMHEX_PLUGINS_IN_SHARE=ON \ - -DIMHEX_USE_BUNDLED_CA=ON \ .. DESTDIR=AppDir ninja install diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ba935bcc..ae29fd63e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.20) # Options -option(IMHEX_USE_BUNDLED_CA "Use the CA bundle in romfs instead of the system one" OFF) option(IMHEX_PLUGINS_IN_SHARE "Put the plugins in share/imhex/plugins instead of lib[..]/imhex/plugins" OFF) option(IMHEX_STRIP_RELEASE "Strip the release builds" ON) option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index 76225fd30..9a222b26a 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -47,7 +47,6 @@ macro(detectOS) set(CMAKE_INSTALL_BINDIR ".") set(CMAKE_INSTALL_LIBDIR ".") set(PLUGINS_INSTALL_LOCATION "plugins") - set(IMHEX_USE_BUNDLED_CA ON) elseif (APPLE) add_compile_definitions(OS_MACOS) set(CMAKE_INSTALL_BINDIR ".") @@ -71,10 +70,6 @@ macro(detectOS) message(FATAL_ERROR "Unknown / unsupported system!") endif() - if(IMHEX_USE_BUNDLED_CA) - add_compile_definitions(IMHEX_USE_BUNDLED_CA) - endif() - endmacro() # Detect 32 vs. 64 bit system diff --git a/lib/libimhex/source/helpers/http_requests.cpp b/lib/libimhex/source/helpers/http_requests.cpp index 38a061f78..892144f90 100644 --- a/lib/libimhex/source/helpers/http_requests.cpp +++ b/lib/libimhex/source/helpers/http_requests.cpp @@ -36,16 +36,6 @@ namespace hex { curl_easy_setopt(this->m_curl, CURLOPT_XFERINFODATA, this); curl_easy_setopt(this->m_curl, CURLOPT_XFERINFOFUNCTION, progressCallback); curl_easy_setopt(this->m_curl, CURLOPT_PROXY, s_proxyUrl.c_str()); - - #if defined(IMHEX_USE_BUNDLED_CA) - curl_easy_setopt(this->m_curl, CURLOPT_CAINFO, nullptr); - curl_easy_setopt(this->m_curl, CURLOPT_CAPATH, nullptr); - curl_easy_setopt(this->m_curl, CURLOPT_SSLCERTTYPE, "PEM"); - curl_easy_setopt(this->m_curl, CURLOPT_SSL_CTX_FUNCTION, sslCtxFunction); - - this->m_caCert = std::make_unique(); - curl_easy_setopt(this->m_curl, CURLOPT_SSL_CTX_DATA, this->m_caCert.get()); - #endif } CURLcode HttpRequest::sslCtxFunction(CURL *ctx, void *sslctx, void *userData) {