[PR #2185] os: fix sha1 build error with Nettle 4.0

PR: https://github.com/X11Libre/xserver/pull/2185
This commit is contained in:
Alan Coopersmith
2026-03-03 13:12:12 -08:00
committed by Enrico Weigelt, metux IT consult
parent 122ef02e52
commit 854f87d8d3
2 changed files with 7 additions and 2 deletions

View File

@@ -421,7 +421,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

View File

@@ -152,7 +152,8 @@ x_sha1_final(void *ctx, unsigned char result[20])
#elif defined(HAVE_SHA1_IN_LIBNETTLE) /* Use libnettle for SHA1 */
#include <nettle/sha.h>
#include <nettle/sha1.h>
#include <nettle/version.h>
void *
x_sha1_init(void)
@@ -175,7 +176,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;
}