Quellcode durchsuchen

Merge branch 'feature/upgrade_mbedtls_to_v2.16.11' into 'master'

mbedtls: upgrade to release v2.16.11

Closes IDF-3429

See merge request espressif/esp-idf!14294
Mahavir Jain vor 4 Jahren
Ursprung
Commit
4c41a5bbd0
2 geänderte Dateien mit 13 neuen und 9 gelöschten Zeilen
  1. 1 1
      components/mbedtls/mbedtls
  2. 12 8
      components/mbedtls/test/test_esp_crt_bundle.c

+ 1 - 1
components/mbedtls/mbedtls

@@ -1 +1 @@
-Subproject commit 99c88bb7bd7c2d91c6873abd6e6d5ee04f4f164c
+Subproject commit 6465247f67167518b8813ae2faaf422704e4b1a3

+ 12 - 8
components/mbedtls/test/test_esp_crt_bundle.c

@@ -168,6 +168,9 @@ void server_task(void *pvParameters)
         goto exit;
     }
 
+    /* Signal that server is up and hence client task can start now */
+    xSemaphoreGive(*sema);
+
     bool connected = false;
     while (!exit_flag) {
 
@@ -272,8 +275,6 @@ int client_task(const uint8_t *bundle, esp_crt_validate_res_t *res)
         esp_crt_bundle_set(bundle);
     }
 
-
-
     ESP_LOGI(TAG, "Connecting to %s:%s...", SERVER_ADDRESS, SERVER_PORT);
     if ((ret = mbedtls_net_connect(&client.client_fd, SERVER_ADDRESS, SERVER_PORT, MBEDTLS_NET_PROTO_TCP)) != 0) {
         ESP_LOGE(TAG, "mbedtls_net_connect returned -%x", -ret);
@@ -319,13 +320,16 @@ TEST_CASE("custom certificate bundle", "[mbedtls]")
 
    test_case_uses_tcpip();
 
-   xSemaphoreHandle exit_sema = xSemaphoreCreateBinary();
+   xSemaphoreHandle signal_sem = xSemaphoreCreateBinary();
+   TEST_ASSERT_NOT_NULL(signal_sem);
 
    exit_flag = false;
-   xTaskCreate(server_task, "server task", 8192, &exit_sema, 10, NULL);
+   xTaskCreate(server_task, "server task", 8192, &signal_sem, 10, NULL);
 
    // Wait for the server to start up
-   vTaskDelay(100 / portTICK_PERIOD_MS);
+   if (!xSemaphoreTake(signal_sem, 10000 / portTICK_PERIOD_MS)) {
+       TEST_FAIL_MESSAGE("signal_sem not released, server start failed");
+   }
 
    /* Test with default crt bundle that doesnt contain the ca crt */
    client_task(NULL, &validate_res);
@@ -337,11 +341,11 @@ TEST_CASE("custom certificate bundle", "[mbedtls]")
 
    exit_flag = true;
 
-   if (!xSemaphoreTake(exit_sema, 10000 / portTICK_PERIOD_MS)) {
-       TEST_FAIL_MESSAGE("exit_sem not released by server task");
+   if (!xSemaphoreTake(signal_sem, 10000 / portTICK_PERIOD_MS)) {
+       TEST_FAIL_MESSAGE("signal_sem not released, server exit failed");
    }
 
-   vSemaphoreDelete(exit_sema);
+   vSemaphoreDelete(signal_sem);
 }
 
 #endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3)