moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-04 16:45:06 -05:00
Code Issues Releases Wiki Activity

md4: Use non-deprecated functions in mbedTLS >= 2.7.0

Browse Source 
Closes #4983
This commit is contained in:
Steve Holme 2020-02-26 18:24:31 +00:00
parent ada581f2cc
commit f0ec0e902a
No known key found for this signature in database
GPG Key ID: 4059CB85CA7E8F19
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/md4.c
View File

@ -29,10 +29,16 @@
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>
#endif #endif /* USE_OPENSSL */
#ifdef USE_MBEDTLS #ifdef USE_MBEDTLS
#include <mbedtls/config.h> #include <mbedtls/config.h>
#include <mbedtls/version.h>
#if(MBEDTLS_VERSION_NUMBER >= 0x02070000)
#define HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS
#endif #endif
#endif /* USE_MBEDTLS */
#if defined(USE_GNUTLS_NETTLE) #if defined(USE_GNUTLS_NETTLE)
@ -182,6 +188,7 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
#include <mbedtls/md4.h> #include <mbedtls/md4.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"
@ -210,7 +217,11 @@ 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)
{ {
if(ctx->data != NULL) { if(ctx->data != NULL) {
#if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS)
mbedtls_md4(ctx->data, ctx->size, result); mbedtls_md4(ctx->data, ctx->size, result);
#else
(void) mbedtls_md4_ret(ctx->data, ctx->size, result);
#endif
Curl_safefree(ctx->data); Curl_safefree(ctx->data);
ctx->size = 0; ctx->size = 0;