diff options
| author | Benau <Benau@users.noreply.github.com> | 2021-07-30 22:57:11 +0800 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-08-09 10:25:17 +0200 |
| commit | 3f126138be3c459a2794d35f8170e92e65a50dad (patch) | |
| tree | 3f1d7736a90d51f094e55a44b213f3b8b3302855 /lib/sha256.c | |
| parent | b836b065bd6598a8c549863825fcfcd0306b3cb5 (diff) | |
| download | curl-3f126138be3c459a2794d35f8170e92e65a50dad.tar.gz | |
mbedTLS: initial 3.0.0 support
Closes #7428
Diffstat (limited to 'lib/sha256.c')
| -rw-r--r-- | lib/sha256.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/sha256.c b/lib/sha256.c index c34f97e8f..a2e7e4131 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -42,8 +42,9 @@ #ifdef USE_MBEDTLS #include <mbedtls/version.h> -#if(MBEDTLS_VERSION_NUMBER >= 0x02070000) - #define HAS_RESULT_CODE_BASED_FUNCTIONS +#if(MBEDTLS_VERSION_NUMBER >= 0x02070000) && \ + (MBEDTLS_VERSION_NUMBER < 0x03000000) + #define HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS #endif #endif /* USE_MBEDTLS */ @@ -105,8 +106,8 @@ typedef mbedtls_sha256_context SHA256_CTX; static void SHA256_Init(SHA256_CTX *ctx) { -#if !defined(HAS_RESULT_CODE_BASED_FUNCTIONS) - mbedtls_sha256_starts(ctx, 0); +#if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS) + (void) mbedtls_sha256_starts(ctx, 0); #else (void) mbedtls_sha256_starts_ret(ctx, 0); #endif @@ -116,8 +117,8 @@ static void SHA256_Update(SHA256_CTX *ctx, const unsigned char *data, unsigned int length) { -#if !defined(HAS_RESULT_CODE_BASED_FUNCTIONS) - mbedtls_sha256_update(ctx, data, length); +#if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS) + (void) mbedtls_sha256_update(ctx, data, length); #else (void) mbedtls_sha256_update_ret(ctx, data, length); #endif @@ -125,8 +126,8 @@ static void SHA256_Update(SHA256_CTX *ctx, static void SHA256_Final(unsigned char *digest, SHA256_CTX *ctx) { -#if !defined(HAS_RESULT_CODE_BASED_FUNCTIONS) - mbedtls_sha256_finish(ctx, digest); +#if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS) + (void) mbedtls_sha256_finish(ctx, digest); #else (void) mbedtls_sha256_finish_ret(ctx, digest); #endif |