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 index 262106b31..c9c87e368 100644 --- a/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/wifi_connect.c +++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/wifi_connect.c @@ -78,7 +78,11 @@ static void set_time() static void tls_smp_client_init(void) { int ret; - TaskHandle_t _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, diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c index f8fa1cc29..eda6ed287 100644 --- a/wolfcrypt/benchmark/benchmark.c +++ b/wolfcrypt/benchmark/benchmark.c @@ -8201,7 +8201,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 index abcfc8311..8aefd491f 100644 --- 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 index 3f6276500..f63ce5a70 100644 --- 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/wc_port.h b/wolfssl/wolfcrypt/wc_port.h index 306692b64..256712230 100644 --- 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) + #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"