aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-12-06 20:21:16 -0600
committerBrent Cook <bcook@openbsd.org>2015-12-06 20:35:09 -0600
commit5b49c30cbc1cd115a1d39bbdb67271e9d182b7a8 (patch)
tree3873b800eb4c6b7266398de60a8f676dd4f69b91
parentfabe122b4ec9890db09633d15fdb6cc010e7c39f (diff)
downloadportable-5b49c30cbc1cd115a1d39bbdb67271e9d182b7a8.tar.gz
portable-5b49c30cbc1cd115a1d39bbdb67271e9d182b7a8.tar.bz2
portable-5b49c30cbc1cd115a1d39bbdb67271e9d182b7a8.zip
override _PATH_SSL_CA_FILE with OPENSSLDIR at build time
fix #160
-rw-r--r--patches/tls_internal.h.patch12
-rw-r--r--tls/Makefile.am7
2 files changed, 19 insertions, 0 deletions
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 @@
1--- ./openbsd/src/lib/libtls/tls_internal.h Thu Oct 15 16:12:24 2015
2+++ ./tls/tls_internal.h Sun Dec 6 20:18:17 2015
3@@ -24,7 +24,9 @@
4
5 #include <openssl/ssl.h>
6
7+#ifndef _PATH_SSL_CA_FILE
8 #define _PATH_SSL_CA_FILE "/etc/ssl/cert.pem"
9+#endif
10
11 #define TLS_CIPHERS_COMPAT "ALL:!aNULL:!eNULL"
12 #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
8libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined 8libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined
9libtls_la_LIBADD = ../crypto/libcrypto.la ../ssl/libssl.la $(PLATFORM_LDADD) 9libtls_la_LIBADD = ../crypto/libcrypto.la ../ssl/libssl.la $(PLATFORM_LDADD)
10 10
11libtls_la_CPPFLAGS = $(AM_CPPFLAGS)
12if OPENSSLDIR_DEFINED
13libtls_la_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"@OPENSSLDIR@\"
14else
15libtls_la_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(sysconfdir)/ssl\"
16endif
17
11libtls_la_SOURCES = tls.c 18libtls_la_SOURCES = tls.c
12libtls_la_SOURCES += tls_client.c 19libtls_la_SOURCES += tls_client.c
13libtls_la_SOURCES += tls_config.c 20libtls_la_SOURCES += tls_config.c