Land #930, consistently use default CA cert location for Windows

5 files changed, 16 insertions, 30 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f0dfa0..ca7f565 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -414,6 +414,18 @@ else()
         set(LIBTLS_TEST_LIBS tls ${PLATFORM_LIBS})
 endif()
 
+if(OPENSSLDIR STREQUAL "")
+        if(WIN32)
+                set(OPENSSLDIR "C:/Windows/libressl/ssl")
+        else()
+                set(OPENSSLDIR "${CMAKE_INSTALL_PREFIX}/etc/ssl")
+        endif()
+
+        set(CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/ssl")
+else()
+        set(CONF_DIR "${OPENSSLDIR}")
+endif()
+
 add_subdirectory(include)
 add_subdirectory(crypto)
 add_subdirectory(ssl)
@@ -495,12 +507,6 @@ if(ENABLE_LIBRESSL_INSTALL)
         endif()
 endif(ENABLE_LIBRESSL_INSTALL)
 
-if(NOT "${OPENSSLDIR}" STREQUAL "")
-        set(CONF_DIR "${OPENSSLDIR}")
-else()
-        set(CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/ssl")
-endif()
-
 if(ENABLE_LIBRESSL_INSTALL)
         install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR})
         install(DIRECTORY DESTINATION ${CONF_DIR}/certs)
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt
index ffd68e5..868b797 100644
--- a/apps/nc/CMakeLists.txt
+++ b/apps/nc/CMakeLists.txt
@@ -29,11 +29,7 @@ else()
         set(NC_SRC ${NC_SRC} compat/readpassphrase.c)
 endif()
 
-if(NOT "${OPENSSLDIR}" STREQUAL "")
-        add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
-else()
-        add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
-endif()
+add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
 
 add_executable(nc ${NC_SRC})
 target_include_directories(nc
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
index 9cf7a8b..41c7845 100644
--- a/apps/ocspcheck/CMakeLists.txt
+++ b/apps/ocspcheck/CMakeLists.txt
@@ -11,11 +11,7 @@ else()
         set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
 endif()
 
-if(NOT "${OPENSSLDIR}" STREQUAL "")
-        add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
-else()
-        add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
-endif()
+add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
 
 add_executable(ocspcheck ${OCSPCHECK_SRC})
 target_include_directories(ocspcheck
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 7efb143..6056471 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -912,15 +912,7 @@ else()
         endif()
 endif()
 
-if(NOT "${OPENSSLDIR}" STREQUAL "")
-        add_definitions(-DOPENSSLDIR=\"${OPENSSLDIR}\")
-else()
-        if(WIN32)
-                add_definitions(-DOPENSSLDIR=\"C:/Windows/libressl/ssl\")
-        else()
-                add_definitions(-DOPENSSLDIR=\"${CMAKE_INSTALL_PREFIX}/etc/ssl\")
-        endif()
-endif()
+add_definitions(-DOPENSSLDIR=\"${OPENSSLDIR}\")
 
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/crypto.sym SYMS)
 foreach(SYM IN LISTS CRYPTO_UNEXPORT)
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 240dbf8..077f5ee 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -26,11 +26,7 @@ if(WIN32)
         set(LIBTLS_EXTRA_EXPORT ${LIBTLS_EXTRA_EXPORT} ftruncate)
 endif()
 
-if(NOT "${OPENSSLDIR}" STREQUAL "")
-        add_definitions(-DTLS_DEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
-else()
-        add_definitions(-DTLS_DEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
-endif()
+add_definitions(-DTLS_DEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
 
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym DESTINATION
         ${CMAKE_CURRENT_BINARY_DIR})