Permalink
Browse files

use polarssl base64

  • Loading branch information...
1 parent 032edd2 commit 488360551009784ab35c43ee4580e773a2a8a227 @mind04 mind04 committed with mind04 Jan 3, 2015
Showing with 72 additions and 249 deletions.
  1. +1 −1 pdns/Makefile-recursor
  2. +40 −10 pdns/Makefile.am
  3. +22 −232 pdns/base64.cc
  4. +4 −3 pdns/base64.hh
  5. +2 −2 pdns/dist-recursor
  6. +3 −1 pdns/test-base64_cc.cc
@@ -20,7 +20,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 pubsuffix.o ext/polarssl/library/aes.o dnslabeltext.o \
+dns_random.o pubsuffix.o ext/polarssl/library/aes.o ext/polarssl/library/base64.o dnslabeltext.o \
lua-pdns.o lua-recursor.o randomhelper.o recpacketcache.o dns.o \
reczones.o base32.o nsecrecords.o json.o ws-recursor.o ws-api.o \
version.o responsestats.o webserver.o ext/yahttp/yahttp/reqresp.o ext/yahttp/yahttp/router.o \
View
@@ -439,6 +439,8 @@ sdig_SOURCES = \
statbag.cc \
unix_utility.cc
+sdig_LDADD = $(POLARSSL_LIBS)
+
saxfr_SOURCES = \
base32.cc \
base64.cc base64.hh \
@@ -458,7 +460,7 @@ saxfr_SOURCES = \
statbag.cc \
unix_utility.cc
-saxfr_LDADD= $(POLARSSL_LIBS)
+saxfr_LDADD = $(POLARSSL_LIBS)
if PKCS11
saxfr_SOURCES += pkcs11signers.cc pkcs11signers.hh
@@ -483,8 +485,13 @@ dnstcpbench_SOURCES = \
statbag.cc \
unix_utility.cc
-dnstcpbench_LDFLAGS = $(THREADFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
-dnstcpbench_LDADD = $(BOOST_PROGRAM_OPTIONS_LIBS)
+dnstcpbench_LDFLAGS = \
+ $(THREADFLAGS) \
+ $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
+
+dnstcpbench_LDADD = \
+ $(POLARSSL_LIBS) \
+ $(BOOST_PROGRAM_OPTIONS_LIBS)
dnsdist_SOURCES = \
arguments.cc \
@@ -507,8 +514,13 @@ dnsdist_SOURCES = \
statbag.cc \
unix_utility.cc
-dnsdist_LDFLAGS = $(THREADFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
-dnsdist_LDADD = $(BOOST_PROGRAM_OPTIONS_LIBS)
+dnsdist_LDFLAGS = \
+ $(THREADFLAGS) \
+ $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
+
+dnsdist_LDADD = \
+ $(POLARSSL_LIBS) \
+ $(BOOST_PROGRAM_OPTIONS_LIBS)
nsec3dig_SOURCES = \
base32.cc \
@@ -607,6 +619,8 @@ speedtest_SOURCES = \
statbag.cc \
unix_utility.cc
+speedtest_LDADD = $(POLARSSL_LIBS)
+
dnswasher_SOURCES = \
dnsparser.hh \
dnspcap.cc dnspcap.hh \
@@ -640,7 +654,9 @@ dnsbulktest_LDFLAGS = \
$(THREADFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
-dnsbulktest_LDADD = $(BOOST_PROGRAM_OPTIONS_LIBS)
+dnsbulktest_LDADD = \
+ $(POLARSSL_LIBS) \
+ $(BOOST_PROGRAM_OPTIONS_LIBS)
dnsscan_SOURCES = \
anadns.hh \
@@ -662,6 +678,8 @@ dnsscan_SOURCES = \
unix_utility.cc \
utility.hh
+dnsscan_LDADD = $(POLARSSL_LIBS)
+
dnsreplay_SOURCES = \
anadns.hh \
base32.cc \
@@ -686,7 +704,9 @@ dnsreplay_LDFLAGS = \
$(THREADFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
-dnsreplay_LDADD = $(BOOST_PROGRAM_OPTIONS_LIBS)
+dnsreplay_LDADD = \
+ $(POLARSSL_LIBS) \
+ $(BOOST_PROGRAM_OPTIONS_LIBS)
nproxy_SOURCES = \
base32.cc \
@@ -711,7 +731,9 @@ nproxy_LDFLAGS = \
$(THREADFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
-nproxy_LDADD = $(BOOST_PROGRAM_OPTIONS_LIBS)
+nproxy_LDADD = \
+ $(POLARSSL_LIBS) \
+ $(BOOST_PROGRAM_OPTIONS_LIBS)
notify_SOURCES = \
arguments.cc \
@@ -737,7 +759,9 @@ notify_LDFLAGS = \
$(THREADFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
-notify_LDADD = $(BOOST_PROGRAM_OPTIONS_LIBS)
+notify_LDADD = \
+ $(POLARSSL_LIBS) \
+ $(BOOST_PROGRAM_OPTIONS_LIBS)
dnsscope_SOURCES = \
arguments.cc \
@@ -764,7 +788,9 @@ dnsscope_LDFLAGS = \
$(THREADFLAGS) \
$(BOOST_PROGRAM_OPTIONS_LDFLAGS)
-dnsscope_LDADD = $(BOOST_PROGRAM_OPTIONS_LIBS)
+dnsscope_LDADD = \
+ $(POLARSSL_LIBS) \
+ $(BOOST_PROGRAM_OPTIONS_LIBS)
dnsgram_SOURCES = \
base32.cc \
@@ -785,6 +811,8 @@ dnsgram_SOURCES = \
unix_utility.cc \
utility.hh
+dnsgram_LDADD = $(POLARSSL_LIBS)
+
dnsdemog_SOURCES = \
base32.cc \
base64.cc base64.hh \
@@ -804,6 +832,8 @@ dnsdemog_SOURCES = \
unix_utility.cc \
utility.hh
+dnsdemog_LDADD = $(POLARSSL_LIBS)
+
rec_control_SOURCES = \
arguments.cc arguments.hh \
logger.cc \
Oops, something went wrong.

0 comments on commit 4883605

Please sign in to comment.