diff options
| author | Brent Cook <busterb@gmail.com> | 2023-11-05 14:31:01 -0600 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2023-11-05 14:31:01 -0600 |
| commit | ba0adb9a2f8bc85b6a6ad451fed93c0cf04fdc42 (patch) | |
| tree | d59fe4e7ceed270049694c17e1f19f19d4730256 /apps | |
| parent | d193f43f8b90cbed65ffeec93543d8a3d17bdedc (diff) | |
| parent | 89fcb1a3e50ac224d68891a6014b74639a5f551a (diff) | |
| download | portable-ba0adb9a2f8bc85b6a6ad451fed93c0cf04fdc42.tar.gz portable-ba0adb9a2f8bc85b6a6ad451fed93c0cf04fdc42.tar.bz2 portable-ba0adb9a2f8bc85b6a6ad451fed93c0cf04fdc42.zip | |
Land #930, consistently use default CA cert location for Windows
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/nc/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | apps/ocspcheck/CMakeLists.txt | 6 |
2 files changed, 2 insertions, 10 deletions
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() | |||
| 29 | set(NC_SRC ${NC_SRC} compat/readpassphrase.c) | 29 | set(NC_SRC ${NC_SRC} compat/readpassphrase.c) |
| 30 | endif() | 30 | endif() |
| 31 | 31 | ||
| 32 | if(NOT "${OPENSSLDIR}" STREQUAL "") | 32 | add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") |
| 33 | add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") | ||
| 34 | else() | ||
| 35 | add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") | ||
| 36 | endif() | ||
| 37 | 33 | ||
| 38 | add_executable(nc ${NC_SRC}) | 34 | add_executable(nc ${NC_SRC}) |
| 39 | target_include_directories(nc | 35 | 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() | |||
| 11 | set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c) | 11 | set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c) |
| 12 | endif() | 12 | endif() |
| 13 | 13 | ||
| 14 | if(NOT "${OPENSSLDIR}" STREQUAL "") | 14 | add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") |
| 15 | add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") | ||
| 16 | else() | ||
| 17 | add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") | ||
| 18 | endif() | ||
| 19 | 15 | ||
| 20 | add_executable(ocspcheck ${OCSPCHECK_SRC}) | 16 | add_executable(ocspcheck ${OCSPCHECK_SRC}) |
| 21 | target_include_directories(ocspcheck | 17 | target_include_directories(ocspcheck |