moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Steve Holme 2020-02-20 18:55:55 +00:00
parent 45160a8129
commit 84762ff815
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/md4.c
View File

@ -65,10 +65,11 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
#include <gcrypt.h> #include <gcrypt.h>
#include "curl_memory.h" #include "curl_memory.h"
/* The last #include file should be: */ /* The last #include file should be: */
#include "memdebug.h" #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) 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) static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
{ {
memcpy(result, gcry_md_read(ctx, 0), MD4_DIGEST_LENGTH); memcpy(result, gcry_md_read(*ctx, 0), MD4_DIGEST_LENGTH);
gcry_md_close(ctx); gcry_md_close(*ctx);
} }
#elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4) #elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4)
@ -95,6 +96,7 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
#include <CommonCrypto/CommonDigest.h> #include <CommonCrypto/CommonDigest.h>
#include "curl_memory.h" #include "curl_memory.h"
/* The last #include file should be: */ /* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
@ -135,7 +137,8 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
#include <wincrypt.h> #include <wincrypt.h>
#include "curl_memory.h" #include "curl_memory.h"
/* The last #include file should be: */
/* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
typedef struct { typedef struct {