From 84762ff815d946ea104b600598b32c3bb558ad06 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Thu, 20 Feb 2020 18:55:55 +0000 Subject: md4: Fixed compilation issues when using GNU TLS gcrypt * Don't include 'struct' in the gcrypt MD4_CTX typedef * The call to gcry_md_read() should use a dereferenced ctx * The call to gcry_md_close() should use a dereferenced ctx Additional minor whitespace issue in the USE_WIN32_CRYPTO code. Closes #4959 --- lib/md4.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/md4.c b/lib/md4.c index d02e1764c..2cf674557 100644 --- a/lib/md4.c +++ b/lib/md4.c @@ -65,10 +65,11 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx) #include #include "curl_memory.h" + /* The last #include file should be: */ #include "memdebug.h" -typedef struct gcry_md_hd_t MD4_CTX; +typedef gcry_md_hd_t MD4_CTX; static void MD4_Init(MD4_CTX *ctx) { @@ -82,8 +83,8 @@ static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size) static void MD4_Final(unsigned char *result, MD4_CTX *ctx) { - memcpy(result, gcry_md_read(ctx, 0), MD4_DIGEST_LENGTH); - gcry_md_close(ctx); + memcpy(result, gcry_md_read(*ctx, 0), MD4_DIGEST_LENGTH); + gcry_md_close(*ctx); } #elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4) @@ -95,6 +96,7 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx) #include #include "curl_memory.h" + /* The last #include file should be: */ #include "memdebug.h" @@ -135,7 +137,8 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx) #include #include "curl_memory.h" - /* The last #include file should be: */ + +/* The last #include file should be: */ #include "memdebug.h" typedef struct { -- cgit v1.2.1