changeset 1728:01fb08c43b85

merge
author Matt Johnston <matt@ucc.asn.au>
date Tue, 23 Jun 2020 22:25:57 +0800
parents 57f85129670f (diff) 93dcc97c3f3f (current diff)
children f091f7536aa5
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Tue Jun 23 17:20:05 2020 +0300
+++ b/configure.ac	Tue Jun 23 22:25:57 2020 +0800
@@ -549,7 +549,7 @@
 	[
 		BUNDLED_LIBTOM=0
 		AC_CHECK_LIB(tommath, mp_to_ubin, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", BUNDLED_LIBTOM=1)
-		AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", BUNDLED_LIBTOM=1)
+		AC_CHECK_LIB(tomcrypt, poly1305_init, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", BUNDLED_LIBTOM=1)
 	]
 )
 
--- a/includes.h	Tue Jun 23 17:20:05 2020 +0300
+++ b/includes.h	Tue Jun 23 22:25:57 2020 +0800
@@ -25,6 +25,8 @@
 #ifndef DROPBEAR_INCLUDES_H_
 #define DROPBEAR_INCLUDES_H_
 
+/* uclibc needs _GNU_SOURCE, maybe other things? */
+#define _GNU_SOURCE
 
 #include "options.h"
 #include "debug.h"
@@ -125,8 +127,6 @@
 #endif
 
 #ifdef HAVE_SYS_RANDOM_H
-/* uclibc needs _GNU_SOURCE */
-#define _GNU_SOURCE
 #include <sys/random.h>
 #endif