IGNITE-27407 C++ Client: Fix compilation with gcc-15 (#7274)

Co-authored-by: dzabotlin <[email protected]>

Author: arcolight

modules/platforms/cpp/DEVNOTES.md

@@ -25,12 +25,12 @@ option disabled.
 
 USE_LOCAL_DEPS option set to OFF implies that dependencies will be downloaded, so you will need an internet connection.
 If you want to build project with your local dependencies you can set option USE_LOCAL_DEPS to ON. In this case you need 
-to specify location of the MbedTLS source code library with the MBEDTLS_SOURCE_DIR variable. 
+to specify location of the TF-PSA source code library with the TF_PSA_SOURCE_DIR variable. 
 In this case you have to install: 
  * msgpack-c >= 4.0.0 development package (for Ubuntu: libmsgpack-dev) 
  * Google test library >= 1.12.0 (for Ubuntu: libgtest-dev) if you want to build tests (ENABLE_TESTS = ON)
  * Google mock library >= 1.12.0 (for Ubuntu: libgmock-dev) if you want to build tests (ENABLE_TESTS = ON)
- * MbedTLS == v3.6.0 Source code needed as MbedTLS should be built with the ignite-3 config included
+ * TF-PSA-Crypto == v1.0.0 Source code needed as TF-PSA-Crypto should be built with the ignite-3 config included
 
 You should also specify the general (build type) CMake options. There are two types of build available - `Release` and `Debug`. The choice depends on how are you going to use the resulting artifacts. If you are going to use them in production, use the `Release` build type. If you are planning to just submit a patch for the project, use `Debug`.
 

modules/platforms/cpp/cmake/dependencies.cmake

@@ -22,7 +22,7 @@ set(MBEDTLS_AS_SUBPROJECT ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-add_compile_definitions(MBEDTLS_USER_CONFIG_FILE="${CMAKE_CURRENT_SOURCE_DIR}/ignite/common/detail/ignite_mbedtls_config.h")
+add_compile_definitions(TF_PSA_CRYPTO_USER_CONFIG_FILE="${CMAKE_CURRENT_SOURCE_DIR}/ignite/common/detail/ignite_mbedtls_config.h")
 
 if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.30.0")
     # Avoid warning about FetchContent_Populate:
@@ -53,11 +53,11 @@ if (${USE_LOCAL_DEPS})
         message(STATUS "MSGPACK FOUND: " ${msgpack_VERSION})
     endif()
 
-    if (NOT DEFINED MBEDTLS_SOURCE_DIR)
-        message( FATAL_ERROR "With USE_LOCAL_DEPS specified you have to set MBEDTLS_SOURCE_DIR to path to the MbedTLS source code")
+    if (NOT DEFINED TF_PSA_SOURCE_DIR)
+        message( FATAL_ERROR "With USE_LOCAL_DEPS specified you have to set TF_PSA_SOURCE_DIR to path to the TF-PSA-Crypto source code")
     endif()
 
-    add_subdirectory(${MBEDTLS_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/mbedtls EXCLUDE_FROM_ALL)
+    add_subdirectory(${TF_PSA_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/tf-psa EXCLUDE_FROM_ALL)
     find_package(uni-algo CONFIG REQUIRED)
 
     if (${ENABLE_TESTS})
@@ -72,11 +72,11 @@ if (${USE_LOCAL_DEPS})
 else()
     include(FetchContent)
     fetch_dependency(msgpack-c https://github.com/msgpack/msgpack-c/releases/download/c-6.0.1/msgpack-c-6.0.1.tar.gz 090df53a59b845767fcfc48221b30ee9)
-    fetch_dependency(mbedtls https://github.com/Mbed-TLS/mbedtls/releases/download/v3.6.0/mbedtls-3.6.0.tar.bz2 6b5a45b10e7d1c768ecec69ecf8e7abd)
+    fetch_dependency(tf-psa https://github.com/Mbed-TLS/TF-PSA-Crypto/releases/download/tf-psa-crypto-1.0.0/tf-psa-crypto-1.0.0.tar.bz2 39037452d0314496589ab18461c1535c)
     fetch_dependency(uni-algo https://github.com/uni-algo/uni-algo/archive/v1.2.0.tar.gz 6e0cce94a6b45ebee7b904316df9f87f)
     if (${ENABLE_TESTS})
         fetch_dependency(googletest https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz c8340a482851ef6a3fe618a082304cfc)
     endif()
 endif()
 
-target_compile_definitions(mbedtls INTERFACE MBEDTLS_ALLOW_PRIVATE_ACCESS)
+target_compile_definitions(tfpsacrypto INTERFACE MBEDTLS_ALLOW_PRIVATE_ACCESS)

modules/platforms/cpp/ignite/common/CMakeLists.txt

@@ -54,7 +54,7 @@ set(SOURCES
 
 add_library(${TARGET} STATIC ${SOURCES})
 
-target_link_libraries(${TARGET} PUBLIC MbedTLS::mbedtls)
+target_link_libraries(${TARGET} PUBLIC TF-PSA-Crypto::tfpsacrypto)
 
 target_include_directories(${TARGET} INTERFACE
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>

modules/platforms/cpp/ignite/common/detail/mpi.cpp

@@ -19,7 +19,8 @@
 
 #include "ignite_error.h"
 
-#include <mbedtls/bignum.h>
+#include <tf-psa-crypto/build_info.h>
+#include <mbedtls/private/bignum.h>
 
 #include <utility>
 #include <vector>