dnsdist: add missing mbed TLS includes

diff --git a/pdns/dnsdistdist/.gitignore b/pdns/dnsdistdist/.gitignore
index 469535229c97968746589a9de360f72fd1089b64..ad5dc6452eba1b5c13afc1164bbe557513ae50a4 100644 (file)
--- a/pdns/dnsdistdist/.gitignore
+++ b/pdns/dnsdistdist/.gitignore
@@ -21,6 +21,7 @@
 /delaypipe.cc
 /delaypipe.hh
 /dns.hh
+/dnsdist
 /dnsdist-lua.cc
 /dnsdist-tcp.cc
 /dnsdist-web.cc
@@ -44,6 +45,7 @@
 /iputils.hh
 /libtool
 /ltmain.sh
+/mbedtlscompat.hh
 /misc.cc
 /misc.hh
 /missing

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 2b2ac8d335327854a121533b2fd73d5c10080d6d..c34e2c8816b15bd3ce736dbe1882d7a289fecb1d 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I pdns $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\"
+AM_CPPFLAGS = -I pdns $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) -I$(CURDIR)/ext/mbedtls/include -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\"
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -51,7 +51,12 @@ dnsdist_SOURCES = \
        ext/luawrapper/include/LuaContext.hpp \
        ext/json11/json11.cpp \
        ext/json11/json11.hpp \
-       ext/incbin/incbin.h
+       ext/incbin/incbin.h \
+       ext/mbedtls/include/mbedtls/config.h \
+       ext/mbedtls/include/mbedtls/check_config.h \
+       ext/mbedtls/include/mbedtls/base64.h \
+       ext/mbedtls/include/mbedtls/platform.h \
+       ext/mbedtls/library/base64.c
 
 dnsdist_LDFLAGS = \
        $(AM_LDFLAGS) \

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index c3a567f97ec52e1e2f1d3fd067f0d36e8a628cb6..dd297380483eec15d2cb403cdba8727e5119ceb5 100644 (file)
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -15,6 +15,7 @@ AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])
 AC_SUBST([YAHTTP_LIBS], ['-L$(top_builddir)/ext/yahttp/yahttp -lyahttp'])
 DNSDIST_LUA
 AX_CXX_COMPILE_STDCXX_11(ext,mandatory)
+AC_DEFINE([HAVE_MBEDTLS2], [1], [Defined if mbed TLS version 2.x.x is used])
 
 AC_CONFIG_FILES([Makefile
        ext/yahttp/Makefile

diff --git a/pdns/dnsdistdist/populate b/pdns/dnsdistdist/populate
index adbf0ad6e5e62e5e0067435e3f6cdc79f3db0039..10436731ccb0c322b5a5ad7062d2b9ad03f2a42f 100755 (executable)
--- a/pdns/dnsdistdist/populate
+++ b/pdns/dnsdistdist/populate
@@ -3,10 +3,10 @@
 set -e
 set -x
 
-ln -fs ../base32.hh ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc \
+ln -fs ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc \
   ../dns.hh ../dnslabeltext.rl ../dnsname.cc ../dnsname.hh ../dnsparser.hh \
   ../dnsrulactions.hh ../dnswriter.cc ../dnswriter.hh ../dolog.hh \
-  ../iputils.cc ../iputils.hh ../misc.cc ../misc.hh ../namespaces.hh \
+  ../iputils.cc ../iputils.hh ../mbedtlscompat.hh ../misc.cc ../misc.hh ../namespaces.hh \
   ../pdnsexception.hh ../qtype.cc ../qtype.hh ../sholder.hh ../sodcrypto.cc \
   ../sodcrypto.hh ../dnsdist-web.cc ../sstuff.hh ../dnsdist-tcp.cc \
   ../dnsdist-carbon.cc ../delaypipe.cc ../delaypipe.hh .
@@ -31,6 +31,15 @@ ln -sf ../../../../ext/json11/json11.{hpp,cpp} ext/json11
 mkdir -p ext/incbin
 ln -sf ../../../../ext/incbin/incbin.h ext/incbin
 
+mkdir -p ext/mbedtls/include/mbedtls
+ln -sf ../../../../../../ext/mbedtls/include/mbedtls/config.h \
+  ../../../../../../ext/mbedtls/include/mbedtls/check_config.h \
+  ../../../../../../ext/mbedtls/include/mbedtls/base64.h \
+  ../../../../../../ext/mbedtls/include/mbedtls/platform.h \
+  ext/mbedtls/include/mbedtls
+mkdir -p ext/mbedtls/library
+ln -sf ../../../../../ext/mbedtls/library/base64.c ext/mbedtls/library
+
 pandoc -s -t man ../../docs/manpages/dnsdist.1.md > dnsdist.1
 
 mkdir -p ext/yahttp/yahttp