feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Better fixes

Browse Source
This commit is contained in:
Andras Fekete
2022-12-16 11:55:28 -05:00
parent b9e69f1795
commit 814ad9fc38
5 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
IDE/Espressif/ESP-IDF/examples/wolfssl_client/main/wifi_connect.c
View File

@@ -78,7 +78,11 @@ static void set_time()
static void tls_smp_client_init(void) static void tls_smp_client_init(void)
{ {
int ret; int ret;
#if ESP_IDF_VERSION_MAJOR >= 4
TaskHandle_t _handle; TaskHandle_t _handle;
#else
xTaskHandle _handle;
#endif
/* http://esp32.info/docs/esp_idf/html/dd/d3c/group__xTaskCreate.html */ /* http://esp32.info/docs/esp_idf/html/dd/d3c/group__xTaskCreate.html */
ret = xTaskCreate(tls_smp_client_task, ret = xTaskCreate(tls_smp_client_task,
TLS_SMP_CLIENT_TASK_NAME, TLS_SMP_CLIENT_TASK_NAME,

4
wolfcrypt/benchmark/benchmark.c
View File

@@ -8201,7 +8201,11 @@ void bench_sphincsKeySign(byte level, byte optim)
#endif #endif
double current_time(int reset) double current_time(int reset)
{ {
#if ESP_IDF_VERSION_MAJOR >= 4
TickType_t tickCount; TickType_t tickCount;
#else
portTickType tickCount;
#endif
(void) reset; (void) reset;

4
wolfcrypt/src/port/Espressif/esp32_aes.c
View File

@@ -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) static void esp_aes_bk(const byte* in, byte* out)
{ {
const word32 *inwords = (const word32 *)in; const word32 *inwords = (const word32 *)in;
#if ESP_IDF_VERSION_MAJOR >= 4
uint32_t *outwords = (uint32_t *)out; uint32_t *outwords = (uint32_t *)out;
#else
word32 *outwords = (word32 *)out;
#endif
ESP_LOGV(TAG, "enter esp_aes_bk"); ESP_LOGV(TAG, "enter esp_aes_bk");

4
wolfcrypt/src/port/Espressif/esp32_sha.c
View File

@@ -551,7 +551,11 @@ int wc_esp_digest_state(WC_ESP32SHA* ctx, byte* hash)
* DPORT_SEQUENCE_REG_READ(address + i * 4); * DPORT_SEQUENCE_REG_READ(address + i * 4);
*/ */
esp_dport_access_read_buffer( esp_dport_access_read_buffer(
#if ESP_IDF_VERSION_MAJOR >= 4
(uint32_t*)(hash), /* the result will be found in hash upon exit */ (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 */ SHA_TEXT_BASE, /* there's a fixed reg addy for all SHA */
wc_esp_sha_digest_size(ctx->sha_type) / sizeof(word32) /* # 4-byte */ wc_esp_sha_digest_size(ctx->sha_type) / sizeof(word32) /* # 4-byte */
); );

4
wolfssl/wolfcrypt/wc_port.h
View File

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