wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-04 13:14:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Addressed review comments

Browse Source
This commit is contained in:
Hideki Miyazaki
2019-01-18 10:53:48 +09:00
parent 4a5c380f32
commit 9879425c5f
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/helper.c
View File

@@ -170,9 +170,7 @@ void app_main(void)
ESP_LOGI(TAG, "Start app_main..."); ESP_LOGI(TAG, "Start app_main...");
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());
#ifndef NO_CRYPT_BENCHMARK
ESP_LOGI(TAG, "Start benchmark..");
wolf_benchmark_task( );
/* when using atecc608a on esp32-wroom-32se */ /* when using atecc608a on esp32-wroom-32se */
#if defined(WOLFSSL_ESPWROOM32SE) && defined(HAVE_PK_CALLBACKS) \ #if defined(WOLFSSL_ESPWROOM32SE) && defined(HAVE_PK_CALLBACKS) \
@@ -186,7 +184,13 @@ void app_main(void)
#endif #endif
#endif #endif
benchmark_test(NULL); ESP_LOGI(TAG, "Start benchmark..");
wolf_benchmark_task();
#else
ESP_LOGI(TAG, "no crypt benchmark");
#endif /* NO_CRYPT_BENCHMARK */
} }

4
IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/server-tls.c
View File

@@ -48,7 +48,7 @@ static const char* const TAG = "tls_server";
static void ShowCiphers(void) static void ShowCiphers(void)
{ {
static char ciphers[4096]; char ciphers[4096];
int ret = wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers)); int ret = wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers));
@@ -63,8 +63,6 @@ static void ShowCiphers(void)
#include "wolfssl/wolfcrypt/port/atmel/atmel.h" #include "wolfssl/wolfcrypt/port/atmel/atmel.h"
int atcatls_set_callbacks(struct WOLFSSL_CTX* ctx);
/* when you want to use a custom slot allocation */ /* when you want to use a custom slot allocation */
/* enable the difinition CUSTOM_SLOT_ALLOCATION. */ /* enable the difinition CUSTOM_SLOT_ALLOCATION. */

4
IDE/Espressif/ESP-IDF/libs/CMakeLists.txt
View File

@@ -23,6 +23,10 @@ set(COMPONENT_ADD_INCLUDEDIRS
"${WOLFSSL_ROOT}" "${WOLFSSL_ROOT}"
) )
if(IS_DIRECTORY ${IDF_PATH}/components/cryptoauthlib)
list(APPEND COMPONENT_ADD_INCLUDEDIRS "../cryptoauthlib/lib")
endif()
set(COMPONENT_SRCEXCLUDE set(COMPONENT_SRCEXCLUDE
"wolfcrypt/src/aes_asm.S" "wolfcrypt/src/aes_asm.S"
"wolfcrypt/src/evp.c" "wolfcrypt/src/evp.c"

2
wolfcrypt/benchmark/benchmark.c
View File

@@ -5491,9 +5491,7 @@ int main(int argc, char** argv)
#ifdef HAVE_STACK_SIZE #ifdef HAVE_STACK_SIZE
ret = StackSizeCheck(NULL, benchmark_test); ret = StackSizeCheck(NULL, benchmark_test);
#else #else
#ifndef WOLFSSL_ESPIDF
ret = benchmark_test(NULL); ret = benchmark_test(NULL);
#endif
#endif #endif
return ret; return ret;