Remove bundled Nettle in favor of the system version.

lisdude · Feb 10, 2019 · fe1f8fd · fe1f8fd
1 parent 6502fc2
commit fe1f8fd
Show file tree

Hide file tree

Showing 50 changed files with 260 additions and 5,995 deletions.
diff --git a/Makefile.in b/Makefile.in
diff --git a/configure.ac b/configure.ac
@@ -277,6 +277,15 @@ dnl ***************************************************************************
 		CFLAGS+=" `$PCRE_CONFIG --cflags`"
 	fi
 
+ dnl ***************************************************************************
+    AC_CHECK_HEADER([nettle/md5.h], [found_nettle=yes], [found_nettle=no])
+    if test "$found_nettle" != "yes" ; then
+        AC_MSG_ERROR([Nettle could not be found.])
+    else
+        AC_DEFINE(HAS_NETTLE)
+        ELIBS="${ELIBS} -lhogweed -lnettle -lgmp"
+    fi
+
 dnl ***************************************************************************
 echo checking which MOO networking configurations are likely to work...
 define(MOO_ADD_NET_CONFIG,[

diff --git a/crypto.cc b/crypto.cc
@@ -35,11 +35,11 @@
 #include "functions.h"
 #include "crypto.h"
 #include "list.h"
-#include "nettle/hmac.h"
-#include "nettle/md5.h"
-#include "nettle/ripemd160.h"
-#include "nettle/sha1.h"
-#include "nettle/sha2.h"
+#include <nettle/hmac.h>
+#include <nettle/md5.h>
+#include <nettle/ripemd160.h>
+#include <nettle/sha1.h>
+#include <nettle/sha2.h>
 #include "random.h"
 #include "server.h"
 #include "storage.h"

diff --git a/nettle/COPYING.LIB b/nettle/COPYING.LIB
diff --git a/nettle/README b/nettle/README
diff --git a/nettle/hmac-md5.c b/nettle/hmac-md5.c
diff --git a/nettle/hmac-ripemd160.c b/nettle/hmac-ripemd160.c
diff --git a/nettle/hmac-sha1.c b/nettle/hmac-sha1.c
diff --git a/nettle/hmac-sha224.c b/nettle/hmac-sha224.c
diff --git a/nettle/hmac-sha256.c b/nettle/hmac-sha256.c