diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2020-06-23 22:25:57 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2020-06-23 22:25:57 +0800 |
| commit | 05194c7a13139139d672da40df5ccf54c37f50ae (patch) | |
| tree | 9cf04b90eb984c5d198aaef937388c3a849762e2 | |
| parent | e75297580f969c3ea058d331d20bb9243955fa2d (diff) | |
| parent | 7dc01d7cd926e45e7787bacf7dbd427349986e97 (diff) | |
| download | dropbear-05194c7a13139139d672da40df5ccf54c37f50ae.tar.gz | |
merge
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | includes.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 848c261..473cea5 100644 --- a/configure.ac +++ b/configure.ac @@ -549,7 +549,7 @@ AC_ARG_ENABLE(bundled-libtom, [ 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) ] ) @@ -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 |