diff --git a/meson.build b/meson.build index aeea13202..3cc3e38e4 100644 --- a/meson.build +++ b/meson.build @@ -385,7 +385,7 @@ foreach t : test_sha1 sha1_dep = libsha1_dep endif elif t == 'libnettle' - nettle_dep = dependency('nettle', required: false) + nettle_dep = dependency('nettle', version: '>= 2.6', required: false) if nettle_dep.found() sha1_found = true sha1_dep = nettle_dep diff --git a/os/xsha1.c b/os/xsha1.c index 825667b9d..96f3356d5 100644 --- a/os/xsha1.c +++ b/os/xsha1.c @@ -149,7 +149,8 @@ x_sha1_final(void *ctx, unsigned char result[20]) #elif defined(HAVE_SHA1_IN_LIBNETTLE) /* Use libnettle for SHA1 */ -#include +#include +#include void * x_sha1_init(void) @@ -172,7 +173,11 @@ x_sha1_update(void *ctx, void *data, int size) int x_sha1_final(void *ctx, unsigned char result[20]) { +#if NETTLE_VERSION_MAJOR < 4 sha1_digest(ctx, 20, result); +#else + sha1_digest(ctx, result); +#endif free(ctx); return 1; }