From 1dc449fe0a16801739db875c92592f81c86ba3e6 Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@symless.com>
Date: Wed, 16 Oct 2024 21:53:25 +0100
Subject: [PATCH] fix: Use `OPENSSL_EXE_DIR` instead of `OPENSSL_ROOT_DIR` on
 Windows

---
 cmake/Libraries.cmake              | 4 ++--
 src/lib/gui/tls/TlsCertificate.cpp | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake
index e9962ef9b..c240a6bee 100644
--- a/cmake/Libraries.cmake
+++ b/cmake/Libraries.cmake
@@ -525,9 +525,9 @@ macro(configure_openssl)
   if(WIN32) #Used for dev in TLS and WIX
     cmake_path(SET OPENSSL_ROOT_DIR NORMALIZE
                "${CMAKE_BINARY_DIR}/vcpkg_installed/x64-windows")
-    message(STATUS "SET OPENSSL ROOT: ${OPENSSL_ROOT_DIR}")
+    message(VERBOSE "Set OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
     set(OPENSSL_EXE_DIR "${OPENSSL_ROOT_DIR}/tools/openssl")
-    add_definitions(-DOPENSSL_EXE_DIR="${OPENSSL_ROOT_DIR}")
+    add_definitions(-DOPENSSL_EXE_DIR="${OPENSSL_EXE_DIR}")
   endif()
 
 endmacro()
diff --git a/src/lib/gui/tls/TlsCertificate.cpp b/src/lib/gui/tls/TlsCertificate.cpp
index 9e58c3755..115ddd872 100644
--- a/src/lib/gui/tls/TlsCertificate.cpp
+++ b/src/lib/gui/tls/TlsCertificate.cpp
@@ -52,11 +52,14 @@ QString openSslWindowsDir() {
   }
 
   // if the path still isn't found, something is seriously wrong.
-  if (!openSslDir.exists()) {
-    qFatal() << "openssl dir not found: " << openSslDir;
+  const auto path = openSslDir.absolutePath();
+  if (openSslDir.exists()) {
+    qDebug("openssl dir: %s", qUtf8Printable(path));
+  } else {
+    qFatal("openssl dir not found: %s", qUtf8Printable(path));
   }
 
-  return QDir::cleanPath(openSslDir.absolutePath());
+  return QDir::cleanPath(path);
 }
 
 QString openSslWindowsBinary() {