From 0ab2955f9e23fdf990c7503973a283cf5f611225 Mon Sep 17 00:00:00 2001 From: kinichiro Date: Sat, 16 Nov 2019 20:17:37 +0900 Subject: Override the default path of cert.pem in libtls --- tls/CMakeLists.txt | 4 ++-- tls/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tls') diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index 94803ce..bac3afd 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt @@ -24,9 +24,9 @@ if(WIN32) endif() if(NOT "${OPENSSLDIR}" STREQUAL "") - add_definitions(-D_PATH_SSL_CA_FILE=\"${OPENSSLDIR}/cert.pem\") + add_definitions(-DTLS_DEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") else() - add_definitions(-D_PATH_SSL_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") + add_definitions(-DTLS_DEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") endif() add_library(tls ${TLS_SRC}) diff --git a/tls/Makefile.am b/tls/Makefile.am index fec147e..942abf9 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am @@ -13,9 +13,9 @@ libtls_la_LIBADD += $(PLATFORM_LDADD) libtls_la_CPPFLAGS = $(AM_CPPFLAGS) if OPENSSLDIR_DEFINED -libtls_la_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"@OPENSSLDIR@/cert.pem\" +libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"@OPENSSLDIR@/cert.pem\" else -libtls_la_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(sysconfdir)/ssl/cert.pem\" +libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"$(sysconfdir)/ssl/cert.pem\" endif libtls_la_SOURCES = tls.c -- cgit v1.2.3-55-g6feb