feat: update mbedtls from v3.2.1 to v3.6.2

external/crypto/mbedtls/CMakeLists.txt

@@ -1,7 +1,7 @@
 FetchContent_Declare(
     mbedtls
-    GIT_REPOSITORY https://github.com/Mbed-TLS/mbedtls
-    GIT_TAG 869298bffeea13b205343361b7a7daf2b210e33d # v3.2.1
+    GIT_REPOSITORY https://github.com/ccrugoPhilips/mbedtls # Mbed-TLS fork
+    GIT_TAG e0b9fdf17e1d584ac3713fc7970fd9de530e7063 # v3.6.2 with patch
 )
 
 set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL On)

external/crypto/mbedtls/mbedtls_emil_config.h

@@ -131,7 +131,9 @@
  *
  * Comment if your system does not support time functions
  */
+#ifdef EMIL_HOST_BUILD
 #define MBEDTLS_HAVE_TIME
+#endif
 
 /**
  * \def MBEDTLS_HAVE_TIME_DATE

services/network/MbedTlsSession.cpp

@@ -3,7 +3,6 @@
 #include "infra/util/BoundedString.hpp"
 #include "infra/util/BoundedVector.hpp"
 #include "infra/util/ByteRange.hpp"
-#include "infra/util/ReallyAssert.hpp"
 #include "services/network/Address.hpp"
 #include "services/util/Sha256.hpp"
 
@@ -34,7 +33,7 @@ namespace services
         , identifier(reference.identifier)
     {
         mbedtls_ssl_session_init(&session);
-        really_assert(mbedtls_ssl_session_load(&session, reference.serializedSession.begin(), reference.serializedSession.size()) == 0);
+        clientSessionLoaded = mbedtls_ssl_session_load(&session, reference.serializedSession.begin(), reference.serializedSession.size()) ? false : true;
     }
 
     MbedTlsSession::~MbedTlsSession()
@@ -58,6 +57,11 @@ namespace services
         return clientSessionObtained;
     }
 
+    bool MbedTlsSession::IsLoaded()
+    {
+        return clientSessionLoaded;
+    }
+
     int MbedTlsSession::SetSession(mbedtls_ssl_context* context)
     {
         return mbedtls_ssl_set_session(context, &session);
@@ -255,6 +259,12 @@ namespace services
                 {
                     SerializeSessionToFlash(session);
                 });
+
+            if (!storage.back().IsLoaded())
+            {
+                nvm->erase(&persistedSession);
+                storage.pop_back();
+            }
         }
     }
 

services/network/MbedTlsSession.hpp

@@ -27,13 +27,15 @@ namespace services
         virtual void Reinitialize();
         virtual void Obtained();
         virtual bool IsObtained();
+        virtual bool IsLoaded();
         virtual int SetSession(mbedtls_ssl_context* context);
         virtual int GetSession(mbedtls_ssl_context* context);
         virtual const infra::BoundedVector<uint8_t>& Identifier() const;
 
     private:
         mbedtls_ssl_session session;
         bool clientSessionObtained = false;
+        bool clientSessionLoaded = false;
         infra::BoundedVector<uint8_t>::WithMaxSize<32> identifier;
     };