Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

protocomm: enable test cases for esp32s2 with software AES

Browse source
This commit is contained in:
Mahavir Jain 2020-02-19 12:05:13 +05:30
parent 33cdd09385
commit b3e7e61f23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
components/protocomm/test/test_protocomm.c
View file

@ -553,8 +553,18 @@ static esp_err_t test_req_endpoint(session_t *session)
memcpy(enc_test_data, rand_test_data, sizeof(rand_test_data)); memcpy(enc_test_data, rand_test_data, sizeof(rand_test_data));
} }
else if (session->sec_ver == 1) { else if (session->sec_ver == 1) {
#if !CONFIG_MBEDTLS_HARDWARE_AES
// Check if the AES key is correctly set before calling the software encryption
// API. Without this check, the code will crash, resulting in a test case failure.
// For hardware AES, portability layer takes care of this.
if (session->ctx_aes.rk != NULL && session->ctx_aes.nr > 0) {
#endif
mbedtls_aes_crypt_ctr(&session->ctx_aes, sizeof(rand_test_data), &session->nc_off, mbedtls_aes_crypt_ctr(&session->ctx_aes, sizeof(rand_test_data), &session->nc_off,
session->rand, session->stb, rand_test_data, enc_test_data); session->rand, session->stb, rand_test_data, enc_test_data);
#if !CONFIG_MBEDTLS_HARDWARE_AES
}
#endif
} }
ssize_t verify_data_len = 0; ssize_t verify_data_len = 0;
@ -1098,7 +1108,6 @@ static esp_err_t test_security0 (void)
return ESP_OK; return ESP_OK;
} }
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
TEST_CASE("leak test", "[PROTOCOMM]") TEST_CASE("leak test", "[PROTOCOMM]")
{ {
#ifdef CONFIG_HEAP_TRACING #ifdef CONFIG_HEAP_TRACING
@ -1139,7 +1148,6 @@ TEST_CASE("leak test", "[PROTOCOMM]")
TEST_ASSERT(pre_start_mem == post_stop_mem); TEST_ASSERT(pre_start_mem == post_stop_mem);
} }
#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
TEST_CASE("security 0 basic test", "[PROTOCOMM]") TEST_CASE("security 0 basic test", "[PROTOCOMM]")
{ {
@ -1166,7 +1174,6 @@ TEST_CASE("security 1 wrong pop test", "[PROTOCOMM]")
TEST_ASSERT(test_security1_wrong_pop() == ESP_OK); TEST_ASSERT(test_security1_wrong_pop() == ESP_OK);
} }
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
TEST_CASE("security 1 insecure client test", "[PROTOCOMM]") TEST_CASE("security 1 insecure client test", "[PROTOCOMM]")
{ {
TEST_ASSERT(test_security1_insecure_client() == ESP_OK); TEST_ASSERT(test_security1_insecure_client() == ESP_OK);
@ -1176,4 +1183,3 @@ TEST_CASE("security 1 weak session test", "[PROTOCOMM]")
{ {
TEST_ASSERT(test_security1_weak_session() == ESP_OK); TEST_ASSERT(test_security1_weak_session() == ESP_OK);
} }
#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)