From d1b28475acae46cf39d2a883791953910b89ea67 Mon Sep 17 00:00:00 2001
From: Kees Monshouwer <mind04@monshouwer.org>
Date: Tue, 10 Jan 2017 22:50:12 +0100
Subject: [PATCH] hook up ed25519 signer in the recursor

---
 pdns/pdns_recursor.cc                        | 10 ++++++++++
 pdns/recursordist/Makefile.am                |  6 ++++++
 pdns/recursordist/configure.ac               |  1 +
 pdns/recursordist/m4/pdns_check_libsodium.m4 |  1 +
 pdns/recursordist/sodiumsigners.cc           |  1 +
 5 files changed, 19 insertions(+)
 create mode 120000 pdns/recursordist/m4/pdns_check_libsodium.m4
 create mode 120000 pdns/recursordist/sodiumsigners.cc

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index bd79bb4a27..000f5c1d30 100644
--- 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>
@@ -2805,6 +2808,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
index 24eed453d5..202748bb56 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -161,6 +161,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
index fe5e625612..e0fed1e208 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -112,6 +112,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
new file mode 120000
index 0000000000..2dbf381705
--- /dev/null
+++ b/pdns/recursordist/m4/pdns_check_libsodium.m4
@@ -0,0 +1 @@
+../../../m4/pdns_check_libsodium.m4
\ No newline at end of file
diff --git a/pdns/recursordist/sodiumsigners.cc b/pdns/recursordist/sodiumsigners.cc
new file mode 120000
index 0000000000..ef247a5b04
--- /dev/null
+++ b/pdns/recursordist/sodiumsigners.cc
@@ -0,0 +1 @@
+../sodiumsigners.cc
\ No newline at end of file
-- 
2.47.2