hook up ed25519 signer in the recursor

(cherry picked from commit d1b2847)
PowerDNS · May 9, 2017 · 7abbb2c · 7abbb2c
1 parent abfe671
commit 7abbb2c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
@@ -33,6 +33,9 @@
 #include "recpacketcache.hh"
 #include "utility.hh"
 #include "dns_random.hh"
+#ifdef HAVE_LIBSODIUM
+#include <sodium.h>
+#endif
 #include "opensslsigners.hh"
 #include <iostream>
 #include <errno.h>
@@ -2777,6 +2780,13 @@ int serviceMain(int argc, char*argv[])
   g_maxMThreads = ::arg().asNum("max-mthreads");
   checkOrFixFDS();
 
+#ifdef HAVE_LIBSODIUM
+  if (sodium_init() == -1) {
+    L<<Logger::Error<<"Unable to initialize sodium crypto library"<<endl;
+    exit(99);
+  }
+#endif
+
   openssl_thread_setup();
   openssl_seed();
 

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
@@ -230,6 +230,12 @@ pdns_recursor_SOURCES += \
 pdns_recursor_LDADD += $(BOTAN110_LIBS)
 endif
 
+if LIBSODIUM
+pdns_recursor_SOURCES += \
+	sodiumsigners.cc
+pdns_recursor_LDADD += $(LIBSODIUM_LIBS)
+endif
+
 if MALLOC_TRACE
 pdns_recursor_SOURCES += \
 	malloctrace.cc \

diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
@@ -113,6 +113,7 @@ PDNS_CHECK_LIBCRYPTO([
   ]
 )
 PDNS_CHECK_LIBCRYPTO_ECDSA
+PDNS_CHECK_LIBSODIUM
 
 # check for tools we might need
 PDNS_CHECK_RAGEL

diff --git a/pdns/recursordist/m4/pdns_check_libsodium.m4 b/pdns/recursordist/m4/pdns_check_libsodium.m4
@@ -0,0 +1 @@
+../../../m4/pdns_check_libsodium.m4
diff --git a/pdns/recursordist/sodiumsigners.cc b/pdns/recursordist/sodiumsigners.cc
@@ -0,0 +1 @@
+../sodiumsigners.cc