From 5b49c30cbc1cd115a1d39bbdb67271e9d182b7a8 Mon Sep 17 00:00:00 2001 From: Brent Cook <bcook@openbsd.org> Date: Sun, 6 Dec 2015 20:21:16 -0600 Subject: override _PATH_SSL_CA_FILE with OPENSSLDIR at build time fix #160 --- patches/tls_internal.h.patch | 12 ++++++++++++ tls/Makefile.am | 7 +++++++ 2 files changed, 19 insertions(+) create mode 100644 patches/tls_internal.h.patch diff --git a/patches/tls_internal.h.patch b/patches/tls_internal.h.patch new file mode 100644 index 0000000..0f50827 --- /dev/null +++ b/patches/tls_internal.h.patch @@ -0,0 +1,12 @@ +--- ./openbsd/src/lib/libtls/tls_internal.h Thu Oct 15 16:12:24 2015 ++++ ./tls/tls_internal.h Sun Dec 6 20:18:17 2015 +@@ -24,7 +24,9 @@ + + #include <openssl/ssl.h> + ++#ifndef _PATH_SSL_CA_FILE + #define _PATH_SSL_CA_FILE "/etc/ssl/cert.pem" ++#endif + + #define TLS_CIPHERS_COMPAT "ALL:!aNULL:!eNULL" + #define TLS_CIPHERS_DEFAULT "TLSv1.2+AEAD+ECDHE:TLSv1.2+AEAD+DHE" diff --git a/tls/Makefile.am b/tls/Makefile.am index 3621e8e..2d033fd 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am @@ -8,6 +8,13 @@ EXTRA_DIST += CMakeLists.txt libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined libtls_la_LIBADD = ../crypto/libcrypto.la ../ssl/libssl.la $(PLATFORM_LDADD) +libtls_la_CPPFLAGS = $(AM_CPPFLAGS) +if OPENSSLDIR_DEFINED +libtls_la_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"@OPENSSLDIR@\" +else +libtls_la_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(sysconfdir)/ssl\" +endif + libtls_la_SOURCES = tls.c libtls_la_SOURCES += tls_client.c libtls_la_SOURCES += tls_config.c -- cgit v1.2.3-55-g6feb