DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-04 12:15:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

configure: check for nettle_memeql_sec()

Browse Source 
This fixes build with nettle versions before 3.3.
This commit is contained in:
Miroslav Lichvar
2025-05-05 14:17:26 +02:00
parent c17f481a20
commit f5fdfee150
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@@ -898,6 +898,13 @@ if [ $feat_sechash = "1" ] && [ "x$HASH_LINK" = "x" ] && [ $try_nettle = "1" ];
EXTRA_OBJECTS="$EXTRA_OBJECTS cmac_nettle.o" EXTRA_OBJECTS="$EXTRA_OBJECTS cmac_nettle.o"
EXTRA_CLI_OBJECTS="$EXTRA_CLI_OBJECTS cmac_nettle.o" EXTRA_CLI_OBJECTS="$EXTRA_CLI_OBJECTS cmac_nettle.o"
fi fi
if test_code 'nettle_memeql_sec()' 'nettle/memops.h' \
"$test_cflags" "$test_link" \
'return nettle_memeql_sec("", "", 0);'
then
add_def HAVE_NETTLE_MEMEQL
fi
fi fi
fi fi

4
util.c
View File

@@ -29,7 +29,7 @@
#include "sysincl.h" #include "sysincl.h"
#if defined(HAVE_NETTLE) #if defined(HAVE_NETTLE_MEMEQL)
#include <nettle/memops.h> #include <nettle/memops.h>
#elif defined(HAVE_GNUTLS) #elif defined(HAVE_GNUTLS)
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
@@ -1660,7 +1660,7 @@ UTI_SplitString(char *string, char **words, int max_saved_words)
int int
UTI_IsMemoryEqual(const void *s1, const void *s2, unsigned int len) UTI_IsMemoryEqual(const void *s1, const void *s2, unsigned int len)
{ {
#if defined(HAVE_NETTLE) #if defined(HAVE_NETTLE_MEMEQL)
return nettle_memeql_sec(s1, s2, len); return nettle_memeql_sec(s1, s2, len);
#elif defined(HAVE_GNUTLS) #elif defined(HAVE_GNUTLS)
return gnutls_memcmp(s1, s2, len) == 0; return gnutls_memcmp(s1, s2, len) == 0;