Permalink
Browse files

use polarssl aes in recursor

  • Loading branch information...
1 parent e22d9b4 commit 990ad9a634ad4790689bbc046e36750474e5bc16 @mind04 mind04 committed with mind04 Dec 14, 2013
Showing with 8 additions and 5 deletions.
  1. +2 −2 pdns/Makefile-recursor
  2. +1 −1 pdns/Makefile.am
  3. +5 −2 pdns/dist-recursor
@@ -4,7 +4,7 @@ BINDIR=/usr/bin/
SYSCONFDIR=/etc/powerdns/
LOCALSTATEDIR=/var/run/
OPTFLAGS?=-O3
-CXXFLAGS:= $(CXXFLAGS) -Iext/rapidjson/include -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread
+CXXFLAGS:= $(CXXFLAGS) -Iext/rapidjson/include -Iext/polarssl-1.3.2/include/polarssl -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread
CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread
LDFLAGS:=$(LDFLAGS) $(ARCHFLAGS) -pthread
@@ -19,7 +19,7 @@ PDNS_RECURSOR_OBJECTS=syncres.o misc.o unix_utility.o qtype.o logger.o \
arguments.o lwres.o pdns_recursor.o recursor_cache.o dnsparser.o \
dnswriter.o dnsrecords.o rcpgenerator.o base64.o zoneparser-tng.o \
rec_channel.o rec_channel_rec.o selectmplexer.o sillyrecords.o \
-dns_random.o aescrypt.o aeskey.o aes_modes.o aestab.o dnslabeltext.o \
+dns_random.o ext/polarssl-1.3.2/library/aes.o dnslabeltext.o \
lua-pdns.o lua-recursor.o randomhelper.o recpacketcache.o dns.o \
reczones.o base32.o nsecrecords.o json.o json_ws.o version.o
View
@@ -283,7 +283,7 @@ recpacketcache.cc recpacketcache.hh dns.cc nsecrecords.cc base32.cc cachecleaner
json.cc json.hh version.hh version.cc
pdns_recursor_LDFLAGS= $(LUA_LIBS)
-pdns_recursor_LDADD=
+pdns_recursor_LDADD= $(POLARSSL_LIBS)
pdns_control_SOURCES=dynloader.cc dynmessenger.cc arguments.cc logger.cc statbag.cc \
misc.cc unix_utility.cc qtype.cc
View
@@ -34,7 +34,7 @@ base64.cc zoneparser-tng.cc rec_channel.cc rec_channel_rec.cc rec_control.cc \
selectmplexer.cc epollmplexer.cc kqueuemplexer.cc portsmplexer.cc pdns_hw.cc \
sillyrecords.cc lua-pdns.cc lua-recursor.cc randomhelper.cc \
devpollmplexer.cc recpacketcache.cc dns.cc reczones.cc base32.cc nsecrecords.cc \
-dnslabeltext.cc json.cc json_ws.cc json_ws.hh version.cc"
+dnslabeltext.cc json.cc json_ws.cc json_ws.hh version.cc dns_random.cc"
cd docs
make pdns_recursor.1 rec_control.1
@@ -55,9 +55,12 @@ EOF
mkdir -p $DIRNAME/ext/rapidjson/include/rapidjson/internal
cp -a ext/rapidjson/include/rapidjson/*.h $DIRNAME/ext/rapidjson/include/rapidjson/
cp -a ext/rapidjson/include/rapidjson/internal/*.h $DIRNAME/ext/rapidjson/include/rapidjson/internal
+mkdir -p $DIRNAME/ext/polarssl-1.3.2/include/polarssl
+cp -a ext/polarssl-1.3.2/include/polarssl/config.h ext/polarssl-1.3.2/include/polarssl/aes.h ext/polarssl-1.3.2/include/polarssl/padlock.h $DIRNAME/ext/polarssl-1.3.2/include/polarssl
+mkdir -p $DIRNAME/ext/polarssl-1.3.2/library
+cp -a ext/polarssl-1.3.2/library/aes.c $DIRNAME/ext/polarssl-1.3.2/library
mkdir $DIRNAME/rrd
cp tools/rrd/{create,update,makegraphs,index.html} $DIRNAME/rrd
-cp aes/*.{c,cc,h} $DIRNAME
cp pdns-recursor.init.d $DIRNAME
cp docs/pdns_recursor.1 docs/rec_control.1 $DIRNAME
cp configure-recursor $DIRNAME/configure

0 comments on commit 990ad9a

Please sign in to comment.