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

fix: building with mbedtls 3.X (#6822) 

uses renamed funtion name for mbedtls 3.x

Signed-off-by: Seo Suchan <tjtncks@gmail.com>
This commit is contained in:
orangepizza 2024-05-26 02:41:03 +09:00 committed by GitHub
parent be67b33f42
commit 8bb49e3fdf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libtransmission/crypto-utils-mbedtls.cc
View File

@ -118,7 +118,7 @@ void tr_sha1::clear()
{ {
mbedtls_sha1_init(&handle_); mbedtls_sha1_init(&handle_);
#if MBEDTLS_VERSION_NUMBER >= 0x02070000 #if MBEDTLS_VERSION_NUMBER < 0x03000000 && MBEDTLS_VERSION_NUMBER >= 0x02070000
mbedtls_sha1_starts_ret(&handle_); mbedtls_sha1_starts_ret(&handle_);
#else #else
mbedtls_sha1_starts(&handle_); mbedtls_sha1_starts(&handle_);
@ -132,7 +132,7 @@ void tr_sha1::add(void const* data, size_t data_length)
return; return;
} }
#if MBEDTLS_VERSION_NUMBER >= 0x02070000 #if MBEDTLS_VERSION_NUMBER < 0x03000000 && MBEDTLS_VERSION_NUMBER >= 0x02070000
mbedtls_sha1_update_ret(&handle_, static_cast<unsigned char const*>(data), data_length); mbedtls_sha1_update_ret(&handle_, static_cast<unsigned char const*>(data), data_length);
#else #else
mbedtls_sha1_update(&handle_, static_cast<unsigned char const*>(data), data_length); mbedtls_sha1_update(&handle_, static_cast<unsigned char const*>(data), data_length);
@ -143,7 +143,7 @@ tr_sha1_digest_t tr_sha1::finish()
{ {
auto digest = tr_sha1_digest_t{}; auto digest = tr_sha1_digest_t{};
auto* const digest_as_uchar = reinterpret_cast<unsigned char*>(std::data(digest)); auto* const digest_as_uchar = reinterpret_cast<unsigned char*>(std::data(digest));
#if MBEDTLS_VERSION_NUMBER >= 0x02070000 #if MBEDTLS_VERSION_NUMBER < 0x03000000 && MBEDTLS_VERSION_NUMBER >= 0x02070000
mbedtls_sha1_finish_ret(&handle_, digest_as_uchar); mbedtls_sha1_finish_ret(&handle_, digest_as_uchar);
#else #else
mbedtls_sha1_finish(&handle_, digest_as_uchar); mbedtls_sha1_finish(&handle_, digest_as_uchar);
@ -165,10 +165,10 @@ void tr_sha256::clear()
{ {
mbedtls_sha256_init(&handle_); mbedtls_sha256_init(&handle_);
#if MBEDTLS_VERSION_NUMBER >= 0x02070000 #if MBEDTLS_VERSION_NUMBER < 0x03000000 && MBEDTLS_VERSION_NUMBER >= 0x02070000
mbedtls_sha256_starts_ret(&handle_, 0); mbedtls_sha256_starts_ret(&handle_, 0);
#else #else
mbedtls_sha256_starts(&handle_); mbedtls_sha256_starts(&handle_, 0);
#endif #endif
} }
@ -179,7 +179,7 @@ void tr_sha256::add(void const* data, size_t data_length)
return; return;
} }
#if MBEDTLS_VERSION_NUMBER >= 0x02070000 #if MBEDTLS_VERSION_NUMBER < 0x03000000 && MBEDTLS_VERSION_NUMBER >= 0x02070000
mbedtls_sha256_update_ret(&handle_, static_cast<unsigned char const*>(data), data_length); mbedtls_sha256_update_ret(&handle_, static_cast<unsigned char const*>(data), data_length);
#else #else
mbedtls_sha256_update(&handle_, static_cast<unsigned char const*>(data), data_length); mbedtls_sha256_update(&handle_, static_cast<unsigned char const*>(data), data_length);
@ -190,7 +190,7 @@ tr_sha256_digest_t tr_sha256::finish()
{ {
auto digest = tr_sha256_digest_t{}; auto digest = tr_sha256_digest_t{};
auto* const digest_as_uchar = reinterpret_cast<unsigned char*>(std::data(digest)); auto* const digest_as_uchar = reinterpret_cast<unsigned char*>(std::data(digest));
#if MBEDTLS_VERSION_NUMBER >= 0x02070000 #if MBEDTLS_VERSION_NUMBER < 0x03000000 && MBEDTLS_VERSION_NUMBER >= 0x02070000
mbedtls_sha256_finish_ret(&handle_, digest_as_uchar); mbedtls_sha256_finish_ret(&handle_, digest_as_uchar);
#else #else
mbedtls_sha256_finish(&handle_, digest_as_uchar); mbedtls_sha256_finish(&handle_, digest_as_uchar);