Check mbedtls version to determine which functions to use. (#979)

Co-authored-by: Thomas Cherryhomes <[email protected]>

Author: FozzTexx

lib/FileSystem/fnFileCache.cpp

@@ -10,6 +10,7 @@
 #include <algorithm>
 
 // TODO: Replace MD5 with some simple non-crypto hash function producing 128+ bit hash ...
+#include <mbedtls/version.h>
 #include <mbedtls/md5.h>
 
 #include "../../include/debug.h"
@@ -61,24 +62,24 @@ static std::string encode_host_path(const char *host, const char *path)
     unsigned char md5_result[16];
     std::string result;
     // host part
-    #ifdef mbedtls_md5_ret
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     int err = mbedtls_md5_ret((const unsigned char *)host, strlen(host), md5_result);
     if (err != 0) {
-        Debug_printf("mbedtls_md5_ret failed with error code %d\n", ret);
+        Debug_printf("mbedtls_md5_ret failed with error code %d\n", err);
     }
-    #else
+#else
     mbedtls_md5((const unsigned char *)host, strlen(host), md5_result);
-    #endif
+#endif
     result = encode_base32(std::string((char *)md5_result, 5)) + '-';
     // path part
-    #ifdef mbedtls_md5_ret
-    int err = mbedtls_md5_ret((const unsigned char *)path, strlen(path), md5_result);
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    err = mbedtls_md5_ret((const unsigned char *)path, strlen(path), md5_result);
     if (err != 0) {
-        Debug_printf("mbedtls_md5_ret failed with error code %d\n", ret);
+        Debug_printf("mbedtls_md5_ret failed with error code %d\n", err);
     }
-    #else
+#else
     mbedtls_md5((const unsigned char *)path, strlen(path), md5_result);
-    #endif
+#endif
     result += encode_base32(std::string((char *)md5_result, 15));
     return result;
 }

lib/encoding/hash.cpp

@@ -2,6 +2,7 @@
 #include <iomanip>
 
 #include "hash.h"
+#include <mbedtls/version.h>
 
 Hash hasher;
 
@@ -108,7 +109,7 @@ void Hash::compute_sha1() {
 
     hash_output.resize(20);
 
-#if defined(mbedtls_sha1_starts_ret) && defined(mbedtls_sha1_update_ret) && defined(mbedtls_sha1_finish_ret)
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     int err = 0;
 
     // Use newer API that returns status code
@@ -142,7 +143,7 @@ void Hash::compute_sha256() {
 
     hash_output.resize(32);
 
-#if defined(mbedtls_sha256_starts_ret) && defined(mbedtls_sha256_update_ret) && defined(mbedtls_sha256_finish_ret)
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     int err = 0;
 
     // Use newer API that returns status code
@@ -176,7 +177,7 @@ void Hash::compute_sha512() {
 
     hash_output.resize(64);
 
-#if defined(mbedtls_sha512_starts_ret) && defined(mbedtls_sha512_update_ret) && defined(mbedtls_sha512_finish_ret)
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     int err = 0;
 
     // Use newer API that returns status code

lib/utils/string_utils.cpp

@@ -23,6 +23,7 @@
 #include <cmath>
 #include <sstream>
 #include <iomanip>
+#include <mbedtls/version.h>
 #include <mbedtls/sha1.h>
 #include <mbedtls/base64.h>
 
@@ -555,7 +556,7 @@ namespace mstr {
     {
         unsigned char hash[21] = { 0x00 };
 
-#if defined(mbedtls_sha1_ret)
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
         // Use the newer mbedtls API
         int ret = mbedtls_sha1_ret((const unsigned char *)s.c_str(), s.length(), hash);
         if (ret != 0) {