From cf6dff90de11dc4874a1e6246cedde2ea5b4468d Mon Sep 17 00:00:00 2001
From: Mahavir Jain <mahavir@espressif.com>
Date: Mon, 5 Jan 2026 12:32:58 +0530
Subject: [PATCH] fix(mbedtls): DTLS build issue due to missing timing APIs

---
 components/mbedtls/CMakeLists.txt    |  3 +-
 components/mbedtls/port/esp_timing.c | 94 ++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 components/mbedtls/port/esp_timing.c

diff --git a/components/mbedtls/CMakeLists.txt b/components/mbedtls/CMakeLists.txt
index 6468f5976c..891c8dd9fb 100644
--- a/components/mbedtls/CMakeLists.txt
+++ b/components/mbedtls/CMakeLists.txt
@@ -213,7 +213,8 @@ endforeach()
 list(APPEND mbedtls_targets everest p256m)
 
 set(mbedtls_target_sources "${COMPONENT_DIR}/port/mbedtls_debug.c"
-                           "${COMPONENT_DIR}/port/esp_platform_time.c")
+                           "${COMPONENT_DIR}/port/esp_platform_time.c"
+                           "${COMPONENT_DIR}/port/esp_timing.c")
 
 list(APPEND mbedtls_target_sources "${COMPONENT_DIR}/port/esp_psa_crypto_init.c")
 # Add ESP-IDF NVS-based PSA ITS implementation
diff --git a/components/mbedtls/port/esp_timing.c b/components/mbedtls/port/esp_timing.c
new file mode 100644
index 0000000000..90b0768c64
--- /dev/null
+++ b/components/mbedtls/port/esp_timing.c
@@ -0,0 +1,94 @@
+/*
+ * Portable interface to the CPU cycle counter
+ *
+ * SPDX-FileCopyrightText: The Mbed TLS Contributors
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * SPDX-FileContributor: 2026 Espressif Systems (Shanghai) CO LTD
+ */
+/*
+ * mbedtls_timing_get_timer()m mbedtls_timing_set_delay() and
+ * mbedtls_timing_set_delay only abstracted from mbedtls/library/timing.c
+ * as that does not build on ESP-IDF but these 2 functions are needed for
+ * DTLS (in particular mbedtls_ssl_set_timer_cb() must be called for DTLS
+ * which requires these 2 delay functions).
+ */
+
+#include <mbedtls/build_info.h>
+
+#if !defined(MBEDTLS_ESP_TIMING_C)
+
+#include <sys/time.h>
+#include "mbedtls/timing.h"
+
+struct _hr_time
+{
+    struct timeval start;
+};
+
+unsigned long mbedtls_timing_get_timer( struct mbedtls_timing_hr_time *val, int reset )
+{
+    struct _hr_time *t = (struct _hr_time *) val;
+
+    if( reset )
+    {
+        gettimeofday( &t->start, NULL );
+        return( 0 );
+    }
+    else
+    {
+        unsigned long delta;
+        struct timeval now;
+        gettimeofday( &now, NULL );
+        delta = ( now.tv_sec  - t->start.tv_sec  ) * 1000ul
+              + ( now.tv_usec - t->start.tv_usec ) / 1000;
+        return( delta );
+    }
+}
+
+/*
+ * Set delays to watch
+ */
+void mbedtls_timing_set_delay( void *data, uint32_t int_ms, uint32_t fin_ms )
+{
+    mbedtls_timing_delay_context *ctx = (mbedtls_timing_delay_context *) data;
+
+    ctx->MBEDTLS_PRIVATE(int_ms) = int_ms;
+    ctx->MBEDTLS_PRIVATE(fin_ms) = fin_ms;
+
+    if( fin_ms != 0 )
+        (void) mbedtls_timing_get_timer( &ctx->MBEDTLS_PRIVATE(timer), 1 );
+}
+
+/*
+ * Get number of delays expired
+ */
+int mbedtls_timing_get_delay( void *data )
+{
+    mbedtls_timing_delay_context *ctx = (mbedtls_timing_delay_context *) data;
+    unsigned long elapsed_ms;
+
+    if( ctx->MBEDTLS_PRIVATE(fin_ms) == 0 )
+        return( -1 );
+
+    elapsed_ms = mbedtls_timing_get_timer( &ctx->MBEDTLS_PRIVATE(timer), 0 );
+
+    if( elapsed_ms >= ctx->MBEDTLS_PRIVATE(fin_ms) )
+        return( 2 );
+
+    if( elapsed_ms >= ctx->MBEDTLS_PRIVATE(int_ms) )
+        return( 1 );
+
+    return( 0 );
+}
+
+/*
+ * Get the final delay.
+ */
+uint32_t mbedtls_timing_get_final_delay( const mbedtls_timing_delay_context *data )
+{
+    return( data->MBEDTLS_PRIVATE(fin_ms) );
+}
+
+#endif /* MBEDTLS_ESP_TIMING_C */