From eb6945851bff976dd945b0e24701afb814176b82 Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Fri, 23 Aug 2024 20:59:06 +0800 Subject: [PATCH 1/6] Update integration test to remove the OTA test cases --- .../config/test_param_config.h | 65 +++-------- main/CMakeLists.txt | 1 - main/Kconfig.projbuild | 23 ---- .../hardware_drivers/app_driver.c | 4 +- .../hardware_drivers/app_driver.h | 2 +- main/qualification_app_main.c | 105 ++---------------- 6 files changed, 28 insertions(+), 172 deletions(-) diff --git a/components/FreeRTOS-Libraries-Integration-Tests/config/test_param_config.h b/components/FreeRTOS-Libraries-Integration-Tests/config/test_param_config.h index cae210a..08e3c07 100644 --- a/components/FreeRTOS-Libraries-Integration-Tests/config/test_param_config.h +++ b/components/FreeRTOS-Libraries-Integration-Tests/config/test_param_config.h @@ -158,38 +158,6 @@ #define PKCS11_TEST_LABEL_DEVICE_PUBLIC_KEY_FOR_TLS pkcs11configLABEL_DEVICE_PUBLIC_KEY_FOR_TLS #define PKCS11_TEST_LABEL_DEVICE_CERTIFICATE_FOR_TLS pkcs11configLABEL_DEVICE_CERTIFICATE_FOR_TLS - -#define OTA_RSA_SHA1 1 -#define OTA_RSA_SHA256 2 -#define OTA_ECDSA_SHA256 3 - -/** - * @brief Certificate type for OTA PAL test. - * Valid options are: OTA_RSA_SHA1, OTA_RSA_SHA256, OTA_ECDSA_SHA256. - * - * #define OTA_PAL_TEST_CERT_TYPE OTA_ECDSA_SHA256 - */ -#define OTA_PAL_TEST_CERT_TYPE OTA_ECDSA_SHA256 - -/** - * @brief Path to cert for OTA test PAL. Used to verify signature. - * If applicable, the device must be pre-provisioned with this certificate. Please see - * test/common/ota/test_files for the set of certificates. - */ -#define OTA_PAL_CERTIFICATE_FILE CONFIG_GRI_QUALIFICATION_OTA_PAL_CERTIFICATE_FILE - -/** - * @brief Some devices have a hard-coded name for the firmware image to boot. - */ -#define OTA_PAL_FIRMWARE_FILE CONFIG_GRI_QUALIFICATION_OTA_PAL_FIRMWARE_FILE - -/** - * @brief Some boards OTA PAL layers will use the file names passed into it for the - * image and the certificates because their non-volatile memory is abstracted by a - * file system. Set this to 1 if that is the case for your device. - */ -#define OTA_PAL_USE_FILE_SYSTEM QUALIFICATION_OTA_PAL_USE_FILE_SYSTEM_SETTING - /** * @brief The IoT Thing name for the device for OTA test. * @@ -198,30 +166,23 @@ #define IOT_THING_NAME CONFIG_GRI_QUALIFICATION_THING_NAME /** - * @brief 1 if using PKCS #11 to access the code sign certificate from NVM. + * @brief Log macro for MQTT test. */ -#define OTA_PAL_READ_CERTIFICATE_FROM_NVM_WITH_PKCS11 0 +#ifndef LogDebug + #define LogDebug( x ) +#endif -/** - * @brief Major version for OTA E2E test. - * - * #define OTA_APP_VERSION_MAJOR 0 - */ -#define OTA_APP_VERSION_MAJOR CONFIG_GRI_QUALIFICATION_OTA_APP_VERSION_MAJOR +#ifndef LogInfo + #define LogInfo( x ) +#endif -/** - * @brief Major version for OTA E2E test. - * - * #define OTA_APP_VERSION_MINOR 9 - */ -#define OTA_APP_VERSION_MINOR CONFIG_GRI_QUALIFICATION_OTA_APP_VERSION_MINOR +#ifndef LogWarn + #define LogWarn( x ) +#endif -/** - * @brief Major version for OTA E2E test. - * - * #define OTA_APP_VERSION_BUILD 1 - */ -#define OTA_APP_VERSION_BUILD CONFIG_GRI_QUALIFICATION_OTA_APP_VERSION_BUILD +#ifndef LogError + #define LogError( x ) +#endif #define OUTGOING_PUBLISH_RECORD_COUNT ( 10 ) #define INCOMING_PUBLISH_RECORD_COUNT ( 10 ) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 8e2ee9e..9887e89 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -30,7 +30,6 @@ endif() if( CONFIG_GRI_RUN_QUALIFICATION_TEST ) list(APPEND MAIN_SRCS "qualification_app_main.c" - "demo_tasks/ota_over_mqtt_demo/ota_over_mqtt_demo.c" "demo_tasks/sub_pub_unsub_demo/sub_pub_unsub_demo.c") endif() diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 12e751e..7d9136b 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -87,33 +87,10 @@ menu "Featured FreeRTOS IoT Integration" int "Port for Echo Server to use" default 9000 - config GRI_QUALIFICATION_OTA_PAL_CERTIFICATE_FILE - string "Path to cert for OTA PAL Test." - default "" - - config GRI_QUALIFICATION_OTA_PAL_FIRMWARE_FILE - string "Path to store firmware for OTA PAL Test." - default "/" - - config GRI_QUALIFICATION_OTA_PAL_USE_FILE_SYSTEM - bool "Use File System for OTA PAL Test." - default n - config GRI_QUALIFICATION_THING_NAME string "Thing Name for Device Advisor Test/OTA end-to-end Test" default "PLACE_HOLDER" - config GRI_QUALIFICATION_OTA_APP_VERSION_MAJOR - int "Application version major for OTA end-to-end Test." - default 0 - - config GRI_QUALIFICATION_OTA_APP_VERSION_MINOR - int "Application version minor for OTA end-to-end Test." - default 9 - - config GRI_QUALIFICATION_OTA_APP_VERSION_BUILD - int "Application version build for OTA end-to-end Test." - default 0 endmenu # "Qualification Parameter Configurations" menu "Sub pub unsub demo configurations" diff --git a/main/demo_tasks/temp_sub_pub_and_led_control_demo/hardware_drivers/app_driver.c b/main/demo_tasks/temp_sub_pub_and_led_control_demo/hardware_drivers/app_driver.c index d95ed7f..8df00fe 100644 --- a/main/demo_tasks/temp_sub_pub_and_led_control_demo/hardware_drivers/app_driver.c +++ b/main/demo_tasks/temp_sub_pub_and_led_control_demo/hardware_drivers/app_driver.c @@ -6,7 +6,9 @@ #include "app_driver.h" #include "esp_idf_version.h" -static const char * TAG = "app_driver"; +#ifdef APP_SOC_TEMP_SENSOR_SUPPORTED + static const char * TAG = "app_driver"; +#endif #define GRI_LED_GPIO CONFIG_GRI_TEMPERATURE_PUB_SUB_AND_LED_CONTROL_DEMO_LED_GPIO_NUMBER diff --git a/main/demo_tasks/temp_sub_pub_and_led_control_demo/hardware_drivers/app_driver.h b/main/demo_tasks/temp_sub_pub_and_led_control_demo/hardware_drivers/app_driver.h index 3555532..62f7690 100644 --- a/main/demo_tasks/temp_sub_pub_and_led_control_demo/hardware_drivers/app_driver.h +++ b/main/demo_tasks/temp_sub_pub_and_led_control_demo/hardware_drivers/app_driver.h @@ -20,7 +20,7 @@ #endif /* *INDENT-ON* */ -#include "driver/temp_sensor.h" +#include "driver/temperature_sensor.h" #include "driver/gpio.h" #include "led_strip.h" diff --git a/main/qualification_app_main.c b/main/qualification_app_main.c index 8e9698b..f6d6a17 100644 --- a/main/qualification_app_main.c +++ b/main/qualification_app_main.c @@ -45,10 +45,6 @@ /* SubscribePublishUnsubscribeDemo demo includes. */ #include "sub_pub_unsub_demo.h" -/* OTACodeSigningDemo demo includes. */ -#include "ota_pal.h" -#include "ota_over_mqtt_demo.h" - /* ESP Secure Certificate Manager include. */ #include "esp_secure_cert_read.h" @@ -60,12 +56,16 @@ #include "test_execution_config.h" #include "qualification_test.h" #include "transport_interface_test.h" -#include "ota_pal_test.h" #include "mqtt_test.h" #define keyCLIENT_CERTIFICATE_PEM NULL #define keyCLIENT_PRIVATE_KEY_PEM NULL +/* Use ROOT CA in binary. */ +#ifndef ECHO_SERVER_ROOT_CA + #define ECHO_SERVER_ROOT_CA NULL +#endif + /* Global variables ***********************************************************/ /** @@ -73,33 +73,12 @@ */ static const char * TAG = "qual_main"; -/** - * @brief The AWS code signing certificate passed in from ./certs/aws_codesign.crt - */ -extern const char pcAwsCodeSigningCertPem[] asm ( "_binary_aws_codesign_crt_start" ); - /** * @brief The AWS RootCA1 passed in from ./certs/root_cert_auth.pem */ extern const uint8_t root_cert_auth_crt_start[] asm ( "_binary_root_cert_auth_crt_start" ); extern const uint8_t root_cert_auth_crt_end[] asm ( "_binary_root_cert_auth_crt_end" ); -/** - * @brief The code signing certificate from - * components/FreeRTOS-Libraries-Integration-Tests/FreeRTOS-Libraries-Integration-Tests/src/ota/test_files/ecdsa-sha256-signer.crt.pem.test - */ -const char pcOtaPalTestCodeSigningCertPem[] = \ - "-----BEGIN CERTIFICATE-----\n" \ - "MIIBXDCCAQOgAwIBAgIJAPMhJT8l0C6AMAoGCCqGSM49BAMCMCExHzAdBgNVBAMM\n" \ - "FnRlc3Rfc2lnbmVyQGFtYXpvbi5jb20wHhcNMTgwNjI3MjAwNDQyWhcNMTkwNjI3\n" \ - "MjAwNDQyWjAhMR8wHQYDVQQDDBZ0ZXN0X3NpZ25lckBhbWF6b24uY29tMFkwEwYH\n" \ - "KoZIzj0CAQYIKoZIzj0DAQcDQgAEyza/tGLVbVxhL41iYtC8D6tGEvAHu498gNtq\n" \ - "DtPsKaoR3t5xQx+6zdWiCi32fgFT2vkeVAmX3pf/Gl8nIP48ZqMkMCIwCwYDVR0P\n" \ - "BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMAoGCCqGSM49BAMCA0cAMEQCIDkf\n" \ - "83Oq8sOXhSyJCWAN63gc4vp9//RFCXh/hUXPYcTWAiBgmQ5JV2MZH01Upi2lMflN\n" \ - "YLbC+lYscwcSlB2tECUbJA==\n" \ - "-----END CERTIFICATE-----\n"; - /** * @brief Socket send and receive timeouts to use. Specified in milliseconds. */ @@ -155,7 +134,7 @@ static BaseType_t prvInitializeNetworkContext( char * pcServerName, /*-----------------------------------------------------------*/ #if ( MQTT_TEST_ENABLED == 1 ) || ( TRANSPORT_INTERFACE_TEST_ENABLED == 1 ) || \ - ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) || ( OTA_E2E_TEST_ENABLED == 1 ) + ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) static NetworkContext_t xNetworkContext = { 0 }; static BaseType_t prvInitializeNetworkContext( char * pcServerName, @@ -384,7 +363,7 @@ static BaseType_t prvInitializeNetworkContext( char * pcServerName, return xRet; } #endif /* ( MQTT_TEST_ENABLED == 1 ) || ( TRANSPORT_INTERFACE_TEST_ENABLED == 1 ) || - * ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) || ( OTA_E2E_TEST_ENABLED == 1 ) */ + * ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) */ /*-----------------------------------------------------------*/ uint32_t MqttTestGetTimeMs( void ) @@ -445,12 +424,6 @@ uint32_t MqttTestGetTimeMs( void ) } #endif /* if ( TRANSPORT_INTERFACE_TEST_ENABLED == 1 ) */ -#if ( OTA_PAL_TEST_ENABLED == 1 ) - void SetupOtaPalTestParam( OtaPalTestParam_t * pTestParam ) - { - pTestParam->pageSize = 1 << otaconfigLOG2_FILE_BLOCK_SIZE; - } -#endif /* if ( OTA_PAL_TEST_ENABLED == 1 ) */ /*-----------------------------------------------------------*/ void runQualification( void * pvArgs ) @@ -478,9 +451,9 @@ BaseType_t xQualificationStart( void ) ESP_LOGE( TAG, "Run xQualificationStart" ); - #if ( MQTT_TEST_ENABLED == 1 ) || ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) || ( OTA_E2E_TEST_ENABLED == 1 ) + #if ( MQTT_TEST_ENABLED == 1 ) || ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) prvInitializeNetworkContext( MQTT_SERVER_ENDPOINT, MQTT_SERVER_PORT, NULL, keyCLIENT_CERTIFICATE_PEM, keyCLIENT_PRIVATE_KEY_PEM ); - #endif /* ( MQTT_TEST_ENABLED == 1 ) || ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) || ( OTA_E2E_TEST_ENABLED == 1 ) */ + #endif /* ( MQTT_TEST_ENABLED == 1 ) || ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) */ #if ( TRANSPORT_INTERFACE_TEST_ENABLED == 1 ) #if defined( TRANSPORT_CLIENT_PRIVATE_KEY ) @@ -497,7 +470,7 @@ BaseType_t xQualificationStart( void ) } #endif /* ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) */ - #if ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) || ( OTA_E2E_TEST_ENABLED == 1 ) + #if ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) if( xRet == pdPASS ) { xRet = xCoreMqttAgentManagerStart( &xNetworkContext ); @@ -510,55 +483,7 @@ BaseType_t xQualificationStart( void ) configASSERT( xRet == pdPASS ); } } - #endif /* ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) || ( OTA_E2E_TEST_ENABLED == 1 ) */ - - #if ( OTA_E2E_TEST_ENABLED == 1 ) - if( xRet == pdPASS ) - { - #if CONFIG_GRI_OUTPUT_CERTS_KEYS - ESP_LOGI( TAG, "\nCS Cert: \nLength: %d\n%s", - strlen( pcAwsCodeSigningCertPem ), - pcAwsCodeSigningCertPem ); - #endif /* CONFIG_GRI_OUTPUT_CERTS_KEYS */ - - if( otaPal_SetCodeSigningCertificate( pcAwsCodeSigningCertPem ) ) - { - vStartOTACodeSigningDemo(); - } - else - { - ESP_LOGE( TAG, - "Failed to set the code signing certificate for the AWS OTA " - "library. OTA demo will not be started." ); - - configASSERT( 0 ); - } - } - #endif /* OTA_E2E_TEST_ENABLED == 1 */ - - #if ( OTA_PAL_TEST_ENABLED == 1 ) - if( xRet == pdPASS ) - { - #if CONFIG_GRI_OUTPUT_CERTS_KEYS - ESP_LOGI( TAG, "\nCS Cert: \nLength: %d\n%s", - strlen( pcOtaPalTestCodeSigningCertPem ), - pcOtaPalTestCodeSigningCertPem ); - #endif /* CONFIG_GRI_OUTPUT_CERTS_KEYS */ - - if( otaPal_SetCodeSigningCertificate( pcOtaPalTestCodeSigningCertPem ) ) - { - /* No need to enable OTA task for OTA PAL test. */ - } - else - { - ESP_LOGE( TAG, - "Failed to set the code signing certificate for the AWS OTA " - "library. OTA demo will not be started." ); - - configASSERT( 0 ); - } - } - #endif /* OTA_E2E_TEST_ENABLED == 1 */ + #endif /* ( DEVICE_ADVISOR_TEST_ENABLED == 1 ) */ if( ( xRet = xTaskCreate( runQualification, "QualTask", @@ -583,11 +508,3 @@ BaseType_t xQualificationStart( void ) } #endif /* DEVICE_ADVISOR_TEST_ENABLED == 1 */ /*-----------------------------------------------------------*/ - -#if ( OTA_E2E_TEST_ENABLED == 1 ) - int RunOtaE2eDemo( void ) - { - return 0; - } -#endif /* ( OTA_E2E_TEST_ENABLED == 1) */ -/*-----------------------------------------------------------*/ From ffa2c50e93ad38fae8f7d1cc013bfad9119497fc Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Fri, 23 Aug 2024 21:04:04 +0800 Subject: [PATCH 2/6] Enable unity fixture for qualification test --- sdkconfig.defaults | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sdkconfig.defaults b/sdkconfig.defaults index a728902..12cd2c5 100644 --- a/sdkconfig.defaults +++ b/sdkconfig.defaults @@ -56,3 +56,9 @@ CONFIG_MBEDTLS_TLS_SERVER=n CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=n CONFIG_MBEDTLS_TLS_CLIENT=y CONFIG_MBEDTLS_TLS_ENABLED=y + + +# +# Unity unit testing library +# +CONFIG_UNITY_ENABLE_FIXTURE=y \ No newline at end of file From 4821c5910067feca7c6645c4ebc56c4f4b786ab1 Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Fri, 23 Aug 2024 21:08:19 +0800 Subject: [PATCH 3/6] Update for format --- .../config/test_param_config.h | 22 +++++++++---------- main/qualification_app_main.c | 6 +---- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/components/FreeRTOS-Libraries-Integration-Tests/config/test_param_config.h b/components/FreeRTOS-Libraries-Integration-Tests/config/test_param_config.h index 08e3c07..0ec98e0 100644 --- a/components/FreeRTOS-Libraries-Integration-Tests/config/test_param_config.h +++ b/components/FreeRTOS-Libraries-Integration-Tests/config/test_param_config.h @@ -149,21 +149,21 @@ */ -#define PKCS11_TEST_RSA_KEY_SUPPORT ( 1 ) -#define PKCS11_TEST_EC_KEY_SUPPORT ( 0 ) -#define PKCS11_TEST_IMPORT_PRIVATE_KEY_SUPPORT ( 1 ) -#define PKCS11_TEST_GENERATE_KEYPAIR_SUPPORT ( 0 ) -#define PKCS11_TEST_PREPROVISIONED_SUPPORT ( 0 ) -#define PKCS11_TEST_LABEL_DEVICE_PRIVATE_KEY_FOR_TLS pkcs11configLABEL_DEVICE_PRIVATE_KEY_FOR_TLS -#define PKCS11_TEST_LABEL_DEVICE_PUBLIC_KEY_FOR_TLS pkcs11configLABEL_DEVICE_PUBLIC_KEY_FOR_TLS -#define PKCS11_TEST_LABEL_DEVICE_CERTIFICATE_FOR_TLS pkcs11configLABEL_DEVICE_CERTIFICATE_FOR_TLS +#define PKCS11_TEST_RSA_KEY_SUPPORT ( 1 ) +#define PKCS11_TEST_EC_KEY_SUPPORT ( 0 ) +#define PKCS11_TEST_IMPORT_PRIVATE_KEY_SUPPORT ( 1 ) +#define PKCS11_TEST_GENERATE_KEYPAIR_SUPPORT ( 0 ) +#define PKCS11_TEST_PREPROVISIONED_SUPPORT ( 0 ) +#define PKCS11_TEST_LABEL_DEVICE_PRIVATE_KEY_FOR_TLS pkcs11configLABEL_DEVICE_PRIVATE_KEY_FOR_TLS +#define PKCS11_TEST_LABEL_DEVICE_PUBLIC_KEY_FOR_TLS pkcs11configLABEL_DEVICE_PUBLIC_KEY_FOR_TLS +#define PKCS11_TEST_LABEL_DEVICE_CERTIFICATE_FOR_TLS pkcs11configLABEL_DEVICE_CERTIFICATE_FOR_TLS /** * @brief The IoT Thing name for the device for OTA test. * * #define IOT_THING_NAME "PLACE_HOLDER" */ -#define IOT_THING_NAME CONFIG_GRI_QUALIFICATION_THING_NAME +#define IOT_THING_NAME CONFIG_GRI_QUALIFICATION_THING_NAME /** * @brief Log macro for MQTT test. @@ -184,7 +184,7 @@ #define LogError( x ) #endif -#define OUTGOING_PUBLISH_RECORD_COUNT ( 10 ) -#define INCOMING_PUBLISH_RECORD_COUNT ( 10 ) +#define OUTGOING_PUBLISH_RECORD_COUNT ( 10 ) +#define INCOMING_PUBLISH_RECORD_COUNT ( 10 ) #endif /* TEST_PARAM_CONFIG_H */ diff --git a/main/qualification_app_main.c b/main/qualification_app_main.c index f6d6a17..f048186 100644 --- a/main/qualification_app_main.c +++ b/main/qualification_app_main.c @@ -63,7 +63,7 @@ /* Use ROOT CA in binary. */ #ifndef ECHO_SERVER_ROOT_CA - #define ECHO_SERVER_ROOT_CA NULL + #define ECHO_SERVER_ROOT_CA NULL #endif /* Global variables ***********************************************************/ @@ -221,7 +221,6 @@ static BaseType_t prvInitializeNetworkContext( char * pcServerName, } #if CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL - /* If the digital signature peripheral is being used, get the digital * signature peripheral context from esp_secure_crt_mgr and put into * network context. */ @@ -234,7 +233,6 @@ static BaseType_t prvInitializeNetworkContext( char * pcServerName, xRet = pdFAIL; } #else /* if CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL */ - /* If the DS peripheral is not being used, get the device private key from * esp_secure_crt_mgr and put into network context. */ @@ -307,7 +305,6 @@ static BaseType_t prvInitializeNetworkContext( char * pcServerName, } #if CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL - /* If the digital signature peripheral is being used, get the digital * signature peripheral context from esp_secure_crt_mgr and put into * second network context. */ @@ -320,7 +317,6 @@ static BaseType_t prvInitializeNetworkContext( char * pcServerName, xRet = pdFAIL; } #else /* if CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL */ - /* If the DS peripheral is not being used, get the device private key from * esp_secure_crt_mgr and put into second network context. */ From f8accd24e242818a4fcab6df8c503e21769c4107 Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Fri, 23 Aug 2024 21:13:40 +0800 Subject: [PATCH 4/6] Fix format 2 --- main/qualification_app_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/main/qualification_app_main.c b/main/qualification_app_main.c index f048186..b1ba871 100644 --- a/main/qualification_app_main.c +++ b/main/qualification_app_main.c @@ -221,6 +221,7 @@ static BaseType_t prvInitializeNetworkContext( char * pcServerName, } #if CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL + /* If the digital signature peripheral is being used, get the digital * signature peripheral context from esp_secure_crt_mgr and put into * network context. */ @@ -233,6 +234,7 @@ static BaseType_t prvInitializeNetworkContext( char * pcServerName, xRet = pdFAIL; } #else /* if CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL */ + /* If the DS peripheral is not being used, get the device private key from * esp_secure_crt_mgr and put into network context. */ @@ -305,6 +307,7 @@ static BaseType_t prvInitializeNetworkContext( char * pcServerName, } #if CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL + /* If the digital signature peripheral is being used, get the digital * signature peripheral context from esp_secure_crt_mgr and put into * second network context. */ @@ -317,6 +320,7 @@ static BaseType_t prvInitializeNetworkContext( char * pcServerName, xRet = pdFAIL; } #else /* if CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL */ + /* If the DS peripheral is not being used, get the device private key from * esp_secure_crt_mgr and put into second network context. */ From 871763d38af5b300891dcf60628f50451045f852 Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Fri, 23 Aug 2024 21:31:18 +0800 Subject: [PATCH 5/6] Revert the change --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72cbdaf..7f2d41b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: echo -e "::endgroup::" echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}" - - name: Build for + - name: Build for demo uses: espressif/esp-idf-ci-action@v1 with: esp_idf_version: ${{ matrix.esp_idf_version }} From 0c5ddd64ea4c825bea049bc71d3b64187af0453e Mon Sep 17 00:00:00 2001 From: "Ching-Hsin,Lee" Date: Fri, 23 Aug 2024 22:33:45 +0800 Subject: [PATCH 6/6] Revert build.yml change --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f2d41b..72cbdaf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: echo -e "::endgroup::" echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}" - - name: Build for demo + - name: Build for uses: espressif/esp-idf-ci-action@v1 with: esp_idf_version: ${{ matrix.esp_idf_version }}