romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-23 07:47:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

gnutls: allow building with nettle 4.0

Browse source 
Closes #21169
This commit is contained in:
Xi Ruoyao 2026-04-30 22:53:20 +08:00 • committed by Viktor Szakats
parent 185e67e1fa
commit cfadbaa133
No known key found for this signature in database
5 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/curl_sha512_256.c
View file

@ -75,7 +75,8 @@
#endif
#if !defined(HAS_SHA512_256_IMPLEMENTATION) && defined(USE_GNUTLS)
# include <nettle/sha.h>
# include <nettle/sha2.h>
# include <nettle/version.h>
# ifdef SHA512_256_DIGEST_SIZE
# define USE_GNUTLS_SHA512_256 1
# endif
@ -281,8 +282,12 @@ static CURLcode Curl_sha512_256_finish(unsigned char *digest, void *context)
{
Curl_sha512_256_ctx * const ctx = (Curl_sha512_256_ctx *)context;
#if NETTLE_VERSION_MAJOR >= 4
sha512_256_digest(ctx, (uint8_t *)digest);
#else
sha512_256_digest(ctx,
(size_t)CURL_SHA512_256_DIGEST_SIZE, (uint8_t *)digest);
#endif
return CURLE_OK;
}

5
lib/md5.c
View file

@ -47,6 +47,7 @@
#ifdef USE_GNUTLS
#include <nettle/md5.h>
#include <nettle/version.h>
typedef struct md5_ctx my_md5_ctx;
@ -64,7 +65,11 @@ static void my_md5_update(void *ctx,
static void my_md5_final(unsigned char *digest, void *ctx)
{
#if NETTLE_VERSION_MAJOR >= 4
md5_digest(ctx, digest);
#else
md5_digest(ctx, 16, digest);
#endif
}
#elif defined(USE_OPENSSL) && \

7
lib/sha256.c
View file

@ -113,7 +113,8 @@ static void my_sha256_final(unsigned char *digest, void *in)
}
#elif defined(USE_GNUTLS)
#include <nettle/sha.h>
#include <nettle/sha2.h>
#include <nettle/version.h>
typedef struct sha256_ctx my_sha256_ctx;
@ -132,7 +133,11 @@ static void my_sha256_update(void *ctx,
static void my_sha256_final(unsigned char *digest, void *ctx)
{
#if NETTLE_VERSION_MAJOR >= 4
sha256_digest(ctx, digest);
#else
sha256_digest(ctx, SHA256_DIGEST_SIZE, digest);
#endif
}
#elif defined(USE_MBEDTLS) && \

5
lib/vtls/gtls.c
View file

@ -37,6 +37,7 @@
#include <gnutls/x509.h>
#include <gnutls/crypto.h>
#include <nettle/sha2.h>
#include <nettle/version.h>
#include "urldata.h"
#include "curl_trc.h"
@ -2268,7 +2269,11 @@ static CURLcode gtls_sha256sum(const unsigned char *tmp, /* input */
struct sha256_ctx SHA256pw;
sha256_init(&SHA256pw);
sha256_update(&SHA256pw, (unsigned int)tmplen, tmp);
#if NETTLE_VERSION_MAJOR >= 4
sha256_digest(&SHA256pw, sha256sum);
#else
sha256_digest(&SHA256pw, (unsigned int)sha256len, sha256sum);
#endif
return CURLE_OK;
}

4
m4/curl-gnutls.m4
View file

@ -145,7 +145,7 @@ dnl
if test "$GNUTLS_ENABLED" = "1"; then
USE_GNUTLS_NETTLE=
dnl First check if we can detect either crypto library via transitive linking
AC_CHECK_LIB(gnutls, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
AC_CHECK_LIB(gnutls, nettle_md5_init, [ USE_GNUTLS_NETTLE=1 ])
dnl If not, try linking directly to both of them to see if they are available
if test -z "$USE_GNUTLS_NETTLE"; then
@ -174,7 +174,7 @@ if test "$GNUTLS_ENABLED" = "1"; then
CPPFLAGS="$CPPFLAGS $addcflags"
fi
AC_CHECK_LIB(nettle, nettle_MD5Init,
AC_CHECK_LIB(nettle, nettle_md5_init,
[
USE_GNUTLS_NETTLE=1
],