romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-30 06:17:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

md5: fix compilation with OpenSSL 3.0 API

Browse source 
Only use OpenSSL's MD5 code if it's available.

Also fix wolfSSL build with `NO_MD5`, in which case neither the
wolfSSL/OpenSSL implementation nor the fallback implementation was
used.

Closes https://github.com/curl/curl/pull/7808
This commit is contained in:
Marcel Raad 2021-09-26 09:19:51 +02:00
parent 8dd0f1aa46
commit b352e03ec8
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/md5.c
View file

@ -39,6 +39,20 @@
#endif
#endif /* USE_MBEDTLS */
#if defined(USE_OPENSSL) && !defined(USE_AMISSL)
#include <openssl/opensslconf.h>
#if !defined(OPENSSL_NO_MD5) && !defined(OPENSSL_NO_DEPRECATED_3_0)
#define USE_OPENSSL_MD5
#endif
#endif
#ifdef USE_WOLFSSL
#include <wolfssl/options.h>
#ifndef NO_MD5
#define USE_WOLFSSL_MD5
#endif
#endif
#if defined(USE_GNUTLS)
#include <nettle/md5.h>
@ -65,19 +79,13 @@ static void MD5_Final(unsigned char *digest, MD5_CTX *ctx)
md5_digest(ctx, 16, digest);
}
#elif (defined(USE_OPENSSL) && !defined(USE_AMISSL)) || defined(USE_WOLFSSL)
#elif defined(USE_OPENSSL_MD5) || defined(USE_WOLFSSL_MD5)
#ifdef USE_WOLFSSL
#include <wolfssl/options.h>
#endif
#if defined(USE_OPENSSL) || (defined(USE_WOLFSSL) && !defined(NO_MD5))
/* When OpenSSL or wolfSSL is available, we use their MD5 functions. */
#include <openssl/md5.h>
#include "curl_memory.h"
/* The last #include file should be: */
#include "memdebug.h"
#endif
#elif defined(USE_MBEDTLS)