Merge pull request #5902 from bandi13/ESP-IDF_fixes

Esp idf v5 fixes
wolfSSL · Dec 23, 2022 · 29c46ce · 29c46ce
2 parents 8e0f0d6 + bc15f67
commit 29c46ce
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 12 deletions.
diff --git a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/wifi_connect.c b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/wifi_connect.c
@@ -29,19 +29,17 @@
 #include "nvs_flash.h"
 #if ESP_IDF_VERSION_MAJOR >= 4
 #include "protocol_examples_common.h"
-#endif
-
+#else
 const static int CONNECTED_BIT = BIT0;
 static EventGroupHandle_t wifi_event_group;
+#endif
+
 /* proto-type */
 extern void tls_smp_client_task();
 static void tls_smp_client_init();
 
 const static char *TAG = "tls_client";
 
-static EventGroupHandle_t wifi_event_group;
-extern void tls_smp_client_task();
-
 static void set_time()
 {
     /* set dummy wallclock time. */
@@ -80,7 +78,11 @@ static void set_time()
 static void tls_smp_client_init(void)
 {
     int ret;
-    xTaskHandle _handle;
+#if ESP_IDF_VERSION_MAJOR >= 4
+        TaskHandle_t _handle;
+#else
+        xTaskHandle _handle;
+#endif
     /* http://esp32.info/docs/esp_idf/html/dd/d3c/group__xTaskCreate.html */
     ret = xTaskCreate(tls_smp_client_task,
                       TLS_SMP_CLIENT_TASK_NAME,
@@ -93,6 +95,7 @@ static void tls_smp_client_init(void)
         ESP_LOGI(TAG, "create thread %s failed", TLS_SMP_CLIENT_TASK_NAME);
     }
 }
+#if ESP_IDF_VERSION_MAJOR < 4
 /* event handler for wifi events */
 static esp_err_t wifi_event_handler(void *ctx, system_event_t *event)
 {
@@ -121,6 +124,7 @@ static esp_err_t wifi_event_handler(void *ctx, system_event_t *event)
     }
     return ESP_OK;
 }
+#endif
 /* entry point */
 void app_main(void)
 {
@@ -137,7 +141,6 @@ void app_main(void)
 
     /* */
 #if ESP_IDF_VERSION_MAJOR >= 4
-    (void) wifi_event_handler;
    ESP_ERROR_CHECK(esp_event_loop_create_default());
    /* This helper function configures Wi-Fi or Ethernet, as selected in menuconfig.
    * Read "Establishing Wi-Fi or Ethernet Connection" section in

diff --git a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/wifi_connect.c b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/wifi_connect.c
@@ -29,10 +29,11 @@
 #include "nvs_flash.h"
 #if ESP_IDF_VERSION_MAJOR >= 4
 #include "protocol_examples_common.h"
-#endif
-
+#else
 const static int CONNECTED_BIT = BIT0;
 static EventGroupHandle_t wifi_event_group;
+#endif
+
 /* prefix for logging */
 const static char *TAG = "tls_server";
 /* proto-type definition */
@@ -77,7 +78,11 @@ static void set_time()
 static void tls_smp_server_init(void)
 {
     int ret;
-    xTaskHandle _handle;
+#if ESP_IDF_VERSION_MAJOR >= 4
+        TaskHandle_t _handle;
+#else
+        xTaskHandle _handle;
+#endif
     /* http://esp32.info/docs/esp_idf/html/dd/d3c/group__xTaskCreate.html */
     ret = xTaskCreate(tls_smp_server_task,
                       TLS_SMP_SERVER_TASK_NAME,
@@ -90,6 +95,7 @@ static void tls_smp_server_init(void)
         ESP_LOGI(TAG, "create thread %s failed", TLS_SMP_SERVER_TASK_NAME);
     }
 }
+#if ESP_IDF_VERSION_MAJOR < 4
 /* event handler for wifi events */
 static esp_err_t wifi_event_handler(void *ctx, system_event_t *event)
 {
@@ -118,6 +124,7 @@ static esp_err_t wifi_event_handler(void *ctx, system_event_t *event)
     }
     return ESP_OK;
 }
+#endif
 /* entry point */
 void app_main(void)
 {
@@ -134,7 +141,6 @@ void app_main(void)
 #endif
     /* */
 #if ESP_IDF_VERSION_MAJOR >= 4
-    (void) wifi_event_handler;
    ESP_ERROR_CHECK(esp_event_loop_create_default());
    /* This helper function configures Wi-Fi or Ethernet, as selected in menuconfig.
    * Read "Establishing Wi-Fi or Ethernet Connection" section in

diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c
@@ -8216,7 +8216,11 @@ void bench_sphincsKeySign(byte level, byte optim)
 #endif
     double current_time(int reset)
     {
+    #if ESP_IDF_VERSION_MAJOR >= 4
+        TickType_t tickCount;
+    #else
         portTickType tickCount;
+    #endif
 
         (void) reset;
 

diff --git a/wolfcrypt/src/port/Espressif/esp32_aes.c b/wolfcrypt/src/port/Espressif/esp32_aes.c
@@ -157,7 +157,11 @@ static void esp_aes_hw_Set_KeyMode(Aes *ctx, ESP32_AESPROCESS mode)
 static void esp_aes_bk(const byte* in, byte* out)
 {
     const word32 *inwords = (const word32 *)in;
+#if ESP_IDF_VERSION_MAJOR >= 4
+    uint32_t *outwords      = (uint32_t *)out;
+#else
     word32 *outwords      = (word32 *)out;
+#endif
 
     ESP_LOGV(TAG, "enter esp_aes_bk");
 

diff --git a/wolfcrypt/src/port/Espressif/esp32_sha.c b/wolfcrypt/src/port/Espressif/esp32_sha.c
@@ -551,7 +551,11 @@ int wc_esp_digest_state(WC_ESP32SHA* ctx, byte* hash)
      *    DPORT_SEQUENCE_REG_READ(address + i * 4);
      */
     esp_dport_access_read_buffer(
+#if ESP_IDF_VERSION_MAJOR >= 4
+        (uint32_t*)(hash), /* the result will be found in hash upon exit     */
+#else
         (word32*)(hash), /* the result will be found in hash upon exit     */
+#endif
         SHA_TEXT_BASE,   /* there's a fixed reg addy for all SHA           */
         wc_esp_sha_digest_size(ctx->sha_type) / sizeof(word32) /* # 4-byte */
     );

diff --git a/wolfssl/wolfcrypt/port/Espressif/esp32-crypt.h b/wolfssl/wolfcrypt/port/Espressif/esp32-crypt.h
@@ -27,6 +27,7 @@
 #include "esp_idf_version.h"
 #include "esp_types.h"
 #include "esp_log.h"
+#include "esp_random.h"
 
 #ifdef WOLFSSL_ESP32WROOM32_CRYPT_DEBUG
     #undef LOG_LOCAL_LEVEL

diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
@@ -202,7 +202,11 @@
 #else /* MULTI_THREADED */
     /* FREERTOS comes first to enable use of FreeRTOS Windows simulator only */
     #if defined(FREERTOS)
-        typedef xSemaphoreHandle wolfSSL_Mutex;
+        #if ESP_IDF_VERSION_MAJOR >= 4
+            typedef SemaphoreHandle_t wolfSSL_Mutex;
+        #else
+            typedef xSemaphoreHandle wolfSSL_Mutex;
+        #endif
     #elif defined(FREERTOS_TCP)
         #include "FreeRTOS.h"
         #include "semphr.h"