From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sun, 8 Mar 2015 14:16:15 +0000 (+0100)
Subject: make libsodium optimal
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~88^2~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b62ec78600c34f5afe3c8e00dac01a9f298f050;p=thirdparty%2Fpdns.git

make libsodium optimal
---

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index 26fe837acd..93f0308f40 100644
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -36,7 +36,6 @@
 #include "dnswriter.hh"
 #include "base64.hh"
 #include <fstream>
-#include <sodium.h>
 #include "sodcrypto.hh"
 #undef L
 
@@ -912,10 +911,12 @@ try
   openlog("dnsdist", LOG_PID, LOG_DAEMON);
   g_console=true;
 
+#ifdef HAVE_LIBSODIUM
   if (sodium_init() == -1) {
     cerr<<"Unable to initialize crypto library"<<endl;
     exit(EXIT_FAILURE);
   }
+#endif
 
   po::options_description desc("Allowed options"), hidden, alloptions;
   desc.add_options()
diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 48abba9e39..b6699b6edd 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -5,11 +5,12 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_PROG_CC
 AC_PROG_CXX
+PKG_CHECK_MODULES([libsodium], [libsodium], [AC_DEFINE([HAVE_LIBSODIUM], [1], [Define to 1 if you have libsodium])], [true])
 AC_PROG_LIBTOOL
 BOOST_REQUIRE([1.35])
 BOOST_FOREACH
 BOOST_PROGRAM_OPTIONS([mt])
-PKG_CHECK_MODULES([libsodium], [libsodium])
+
 
 PDNS_WITH_LUA
 AX_CXX_COMPILE_STDCXX_11(ext,mandatory)
diff --git a/pdns/sodcrypto.cc b/pdns/sodcrypto.cc
index c82e5b09f6..f212958018 100644
--- a/pdns/sodcrypto.cc
+++ b/pdns/sodcrypto.cc
@@ -5,6 +5,8 @@
 #include "sodcrypto.hh"
 
 
+#ifdef HAVE_LIBSODIUM
+
 string newKey()
 {
   unsigned char key[crypto_secretbox_KEYBYTES];
@@ -32,6 +34,23 @@ std::string sodDecryptSym(const std::string& msg, const std::string& key, Sodium
   nonce.increment();
   return string((char*)decrypted, sizeof(decrypted));
 }
+#else
+std::string sodEncryptSym(const std::string& msg, const std::string& key, SodiumNonce& nonce)
+{
+  return msg;
+}
+std::string sodDecryptSym(const std::string& msg, const std::string& key, SodiumNonce& nonce)
+{
+  return msg;
+}
+
+string newKey()
+{
+  return "\"plaintext\"";
+}
+
+
+#endif
 
 
 #include "base64.hh"
diff --git a/pdns/sodcrypto.hh b/pdns/sodcrypto.hh
index 35f2227ff4..6bffcc3ae0 100644
--- a/pdns/sodcrypto.hh
+++ b/pdns/sodcrypto.hh
@@ -1,19 +1,19 @@
 #pragma once
+#include "config.h"
 #include <string>
 #include <stdint.h>
-#include <sodium.h>
-#include <arpa/inet.h>
-void sodTest();
-std::string newKeypair();
-
-std::string sodEncryptAsym(const std::string& msg, const std::string& secretSource,
-		       const std::string& publicDest);
-
-
-std::string sodDecryptAsym(const std::string& msg, const std::string& publicSource,
-		       const std::string& secretDest);
 
+#include <arpa/inet.h>
 
+#ifndef HAVE_LIBSODIUM
+struct SodiumNonce
+{
+	void init(){};
+	void increment(){};
+	unsigned char value[1];
+};
+#else
+#include <sodium.h>
 
 struct SodiumNonce
 {
@@ -36,7 +36,8 @@ struct SodiumNonce
 
   unsigned char value[crypto_secretbox_NONCEBYTES];
 };
-
+#endif
+std::string newKeypair();
 std::string sodEncryptSym(const std::string& msg, const std::string& key, SodiumNonce&);
 std::string sodDecryptSym(const std::string& msg, const std::string& key, SodiumNonce&);
 std::string newKey();