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

Fix for ESP32 wolfcrypt_test entry point.

Browse Source
This commit is contained in:
David Garske
2022-09-23 13:55:52 -07:00
parent 792eac9484
commit b42631c721
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@
/* proto-type */ /* proto-type */
extern void wolf_benchmark_task(); extern void wolf_benchmark_task();
extern void wolf_crypt_task();
static const char* const TAG = "wolfbenchmark"; static const char* const TAG = "wolfbenchmark";
char* __argv[22]; char* __argv[22];
@@ -152,7 +153,6 @@ int construct_argv()
void app_main(void) void app_main(void)
{ {
(void) TAG; (void) TAG;
#ifndef NO_CRYPT_BENCHMARK
/* 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) \
@@ -167,7 +167,11 @@ void app_main(void)
atmel_set_slot_allocator(my_atmel_alloc, my_atmel_free); atmel_set_slot_allocator(my_atmel_alloc, my_atmel_free);
#endif #endif
#endif #endif
#ifndef NO_CRYPT_TEST
wolf_crypt_task();
#endif
#ifndef NO_CRYPT_BENCHMARK
wolf_benchmark_task(); wolf_benchmark_task();
#else #endif
#endif /* NO_CRYPT_BENCHMARK */
} }

2
wolfcrypt/benchmark/benchmark.c
View File

@@ -8374,7 +8374,7 @@ static int string_matches(const char* arg, const char* str)
#endif /* MAIN_NO_ARGS */ #endif /* MAIN_NO_ARGS */
#if defined(WOLFSSL_ESPIDF) || defined(_WIN32_WCE) #if defined(WOLFSSL_ESPIDF) || defined(_WIN32_WCE)
int wolf_benchmark_task( ) int wolf_benchmark_task(void)
#elif defined(MAIN_NO_ARGS) #elif defined(MAIN_NO_ARGS)
int main() int main()
#else #else

9
wolfcrypt/test/test.c
View File

@@ -1526,16 +1526,15 @@ options: [-s max_relative_stack_bytes] [-m max_relative_heap_memory_bytes]\n\
#ifndef NO_MAIN_DRIVER #ifndef NO_MAIN_DRIVER
/* so overall tests can pull in test function */
#ifdef WOLFSSL_ESPIDF
void app_main( )
#else
#ifdef HAVE_WOLFCRYPT_TEST_OPTIONS #ifdef HAVE_WOLFCRYPT_TEST_OPTIONS
int myoptind = 0; int myoptind = 0;
char* myoptarg = NULL; char* myoptarg = NULL;
#endif #endif
/* so overall tests can pull in test function */
#if defined(WOLFSSL_ESPIDF) || defined(_WIN32_WCE)
int wolf_test_task(void)
#else
int main(int argc, char** argv) int main(int argc, char** argv)
#endif #endif
{ {