Update libraries to LTS 2.0 version.

.gitmodules

@@ -48,4 +48,4 @@
 	url = https://github.com/ThrowTheSwitch/Unity.git
 [submodule "Middleware/FreeRTOS/tests"]
 	path = Middleware/FreeRTOS/tests
-	url = https://github.com/FreeRTOS/Labs-FreeRTOS-Libraries-Integration-Tests.git
+	url = https://github.com/FreeRTOS/FreeRTOS-Libraries-Integration-Tests.git

GSG.md

@@ -41,7 +41,12 @@ Many of these steps are automated in production environments.
 
 [7 Run the Shadow Demo](#7-run-the-shadow-demo)<br>
 [8 Run the Defender Demo](#8-run-the-defender-demo)<br>
-[9 Troubleshooting Guide](#9-troubleshooting-guide)
+[9 Troubleshooting Guide](#9-troubleshooting-guide)<br>
+[10 Run AWS IoT Device Tester](#10-run-aws-iot-device-tester)<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[10.1 Download AWS IoT Device Tester](#101-download-aws-iot-device-tester)<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[10.2 Configure AWS IoT Device Tester](#102-configure-aws-iot-device-tester)<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[10.3 Configure Divice](#103-configure-device)<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[10.4 Running AWS IoT Device Tester](#104-running-aws-iot-device-tester)<br>
 
 ## 1 Prerequisites
 
@@ -764,11 +769,11 @@ The reference integration can be tested using [AWS IoT Device Tester for FreeRTO
 
 IDT runs a suite of tests that include testing the device's transport interface layer implementation, PKCS11 functionality, and OTA capabilities. In IDT test cases, the IDT binary will make a copy of the source code, update the header files in the `examples/evkbmimxrt1060/test` project, then compile the project and flash the resulting image to your board. Finally, IDT will read serial output from the board and communicate with the AWS IoT cloud to ensure that test cases are passing.
 
-### Download AWS IoT Device Tester
+### 10.1 Download AWS IoT Device Tester
 
 The latest version of IDT can be downloaded from the [public documentation page](https://docs.aws.amazon.com/freertos/latest/userguide/dev-test-versions-afr.html). This reference implementation only supports test suites of version 2.0 or later.
 
-### Configure AWS IoT Device Tester
+### 10.2 Configure AWS IoT Device Tester
 
 After downloading and unzipping IDT onto your file system, you should extract a file structure that includes the following directories:
 
@@ -781,7 +786,6 @@ Before we can run IDT, we have to update the files in `configs`. In this referen
 First, copy one of each file from `idt_configs` (based on host OS) in this reference repository to the `configs` directory inside the newly downloaded IDT project. This should provide you with the following files in `device_tester/configs` directory:
 
 ```
-configs/dummyPublicKeyAsciiHex.txt
 configs/flash.bat or flash.sh
 configs/config.json
 configs/userdata.json
@@ -797,14 +801,47 @@ Next, we need to update some configuration values in these files.
 A few notes on the provided build and flash scripts: First, if you run into issues with the provided scripts, you can copy commands provided by the MCUXpresso IDE during a GUI build and flash to create your own build and flash scripts. Second, these scripts only work if your `test` and `bootloader` project have been built once using the MCUXpresso GUI (this creates a required files `MIMXRT1062xxxxA.xml` and `MIMXRT1062xxxxA_part.xml` at `iot-reference-nxp-rt1060/projects/evkmimxrt1060/$PROJECT/Debug`)
 
 * In `config.json`, update the `profile` and `awsRegion` fields
-* In `device.json`, update `serialPort` to the serial port of your board as from [section 2.1](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/blob/main/GSG.md#21-setting-up-device). Update `publicKeyAsciiHexFilePath` to the absolute path to `dummyPublicKeyAsciiHex.txt`. Update `publicDeviceCertificateArn` to the ARN of the certificate uploaded when [provisioning the device](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/blob/main/GSG.md#41-provisioning-the-device).
+* In `device.json`, update `serialPort` to the serial port of your board as from [section 2.1](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/blob/main/GSG.md#21-setting-up-device). Update `publicDeviceCertificateArn` to the ARN of the certificate uploaded when [provisioning the device](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/blob/main/GSG.md#41-provisioning-the-device).
 * In `userdata.json`, update `sourcePath` to the absolute path to the root of this reference implementation repository.
 * In `userdata.json`, update `signerCertificate` with the ARN of the [application code signing certificate you created.](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/blob/main/GSG.md#62-creating-an-application-code-signing-certificate)
 * Run all the steps to create a [second code signing certificate](https://github.com/FreeRTOS/iot-reference-nxp-rt1060/blob/main/GSG.md#62-creating-an-application-code-signing-certificate) but do NOT provision the key onto your board. Copy the ARN for this certificate in `userdata.json` for the field `untrustedSignerCertificate`.
 
-### Running AWS IoT Device Tester
-
-With all the configuration out of the way, we can run IDT either from an individual test group or test case, or the entire qualification suite.
+### 10.3 Configure Device
+
+To run test cases "OTADataplaneMQTT" / OTACore / FullPKCS11_PreProvisioned_ECC successfully, we need to set our public keys manually once.
+
+- OTADataplaneMQTT
+  - Follow [6.2 Creating an Application Code Signing Certificate](#62-creating-an-application-code-signing-certificate) to set code signing certificate.
+- OTACore
+  - Set appmainPROVISIONING_MODE to 1 and appmainRUN_QUALIFICATIOn_TEST_SUITE to 0 in app_main.c
+  - Build and flash
+  - In TeraTerm or putty, `pki set pub_key sss:00223346`
+  - Copy and paste below content to the serial port
+    ```
+    -----BEGIN PUBLIC KEY-----
+    MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEyza/tGLVbVxhL41iYtC8D6tGEvAH
+    u498gNtqDtPsKaoR3t5xQx+6zdWiCi32fgFT2vkeVAmX3pf/Gl8nIP48Zg==
+    -----END PUBLIC KEY-----
+    ```
+  - Should print “OK”
+- FullPKCS11_PreProvisioned_ECC
+  - Set appmainPROVISIONING_MODE to 1 and appmainRUN_QUALIFICATION_TEST_SUITE to 0 in app_main.c
+  - Build and flash
+  - Get the cert at the label in Teraterm
+    ```
+    pki get cert sss:F0000001
+    ```
+  - Paste that cert into a file cert.pem
+  - Run command `openssl x509 -pubkey -noout -in cert.pem > pubkey.pem`
+  - In TeraTerm or putty, `pki set pub_key sss:00223345`
+  - Paste the content of pubkey.pem to TeraTerm or putty
+  - Should print “OK”
+
+*Note: If you fail at setting public key, try sss:00223343 and remember to change the config.*
+
+### 10.4 Running AWS IoT Device Tester
+
+With configuration complete, IDT can be run for an individual test group, a test case, or the entire qualification suite.
 
 To list the available test groups, run:
 
@@ -826,4 +863,6 @@ To run the entire qualification suite, run:
 
 For more information, `.\devicetester_win_x86-64.exe help` will show all available commands.
 
-When you run IDT, a `results/uuid` directory is generated that will contain all the logs and other information associated with your test run. This allows you to debug any failures.
+When you run IDT, a `results/uuid` directory is generated that will contain all the logs and other information associated with your test run. This allows you to debug any failures.
+
+*Note: Please run qualification test without provision mode (set appmainPROVISIONING_MODE to 0 in [app_main.c](./examples/evkbmimxrt1060/test/app_main.c)).*

examples/common/mqtt_agent/mqtt_agent_task.c

@@ -83,7 +83,7 @@
 #include "using_mbedtls.h"
 
 /* Keystore APIs to fetch configuration data. */
-#include "kvStore.h"
+#include "kvstore.h"
 
 /* Includes MQTT Agent Task management APIs. */
 #include "mqtt_agent_task.h"
@@ -373,7 +373,7 @@ static char * pcDeviceCertID = NULL;
 
 static MQTTStatus_t prvMQTTInit( void )
 {
-    TransportInterface_t xTransport;
+    TransportInterface_t xTransport = { 0 };
     MQTTStatus_t xReturn;
     MQTTFixedBuffer_t xFixedBuffer = { .pBuffer = xNetworkBuffer, .size = MQTT_AGENT_NETWORK_BUFFER_SIZE };
     static uint8_t staticQueueStorageArea[ MQTT_AGENT_COMMAND_QUEUE_LENGTH * sizeof( MQTTAgentCommand_t * ) ];

examples/evkbmimxrt1060/defender/include/FreeRTOSConfig.h

@@ -58,7 +58,7 @@ extern void vLoggingPrintf( const char * pcFormat,
 #define configUSE_DAEMON_TASK_STARTUP_HOOK           1
 #define configCPU_CLOCK_HZ                           ( SystemCoreClock )
 #define configTICK_RATE_HZ                           ( ( TickType_t ) 1000 )
-#define configMAX_PRIORITIES                         ( 7 )
+#define configMAX_PRIORITIES                         ( 9 )
 #define configMINIMAL_STACK_SIZE                     ( ( uint16_t ) 90 )
 #define configTOTAL_HEAP_SIZE                        ( ( size_t ) ( 160 * 1024 ) )    /* 160 Kbytes. */
 #define configMAX_TASK_NAME_LEN                      ( 16 )

examples/evkbmimxrt1060/defender/include/core_mqtt_agent_config.h

@@ -0,0 +1,2 @@
+/* An empty config file for the CBMC proofs to compile with the default
+ * definitions of configuration macros. */

examples/evkbmimxrt1060/defender/main.c

@@ -51,7 +51,7 @@
 
 #include "ksdk_mbedtls.h"
 
-#include "nxlog_App.h"
+#include "nxLog_App.h"
 #include "mflash_drv.h"
 
 #include "ex_sss_boot.h"

examples/evkbmimxrt1060/pubsub/include/FreeRTOSConfig.h

@@ -58,7 +58,7 @@ extern void vLoggingPrintf( const char * pcFormat,
 #define configUSE_DAEMON_TASK_STARTUP_HOOK           1
 #define configCPU_CLOCK_HZ                           ( SystemCoreClock )
 #define configTICK_RATE_HZ                           ( ( TickType_t ) 1000 )
-#define configMAX_PRIORITIES                         ( 7 )
+#define configMAX_PRIORITIES                         ( 9 )
 #define configMINIMAL_STACK_SIZE                     ( ( uint16_t ) 90 )
 #define configTOTAL_HEAP_SIZE                        ( ( size_t ) ( 160 * 1024 ) )    /* 160 Kbytes. */
 #define configMAX_TASK_NAME_LEN                      ( 16 )

examples/evkbmimxrt1060/pubsub/include/core_mqtt_agent_config.h

@@ -0,0 +1,2 @@
+/* An empty config file for the CBMC proofs to compile with the default
+ * definitions of configuration macros. */

examples/evkbmimxrt1060/pubsub/main.c

@@ -51,7 +51,7 @@
 
 #include "ksdk_mbedtls.h"
 
-#include "nxlog_App.h"
+#include "nxLog_App.h"
 #include "mflash_drv.h"
 
 #include "ex_sss_boot.h"
@@ -70,7 +70,7 @@
 /* MAC address configuration. */
 #define configMAC_ADDR                     \
     {                                      \
-        0x02, 0x12, 0x13, 0x10, 0x15, 0x25 \
+        0x00, 0x11, 0x22, 0x33, 0x44, 0x41 \
     }
 
 /* Address of PHY interface. */

examples/evkbmimxrt1060/shadow/include/FreeRTOSConfig.h

@@ -58,7 +58,7 @@ extern void vLoggingPrintf( const char * pcFormat,
 #define configUSE_DAEMON_TASK_STARTUP_HOOK           1
 #define configCPU_CLOCK_HZ                           ( SystemCoreClock )
 #define configTICK_RATE_HZ                           ( ( TickType_t ) 1000 )
-#define configMAX_PRIORITIES                         ( 7 )
+#define configMAX_PRIORITIES                         ( 9 )
 #define configMINIMAL_STACK_SIZE                     ( ( uint16_t ) 90 )
 #define configTOTAL_HEAP_SIZE                        ( ( size_t ) ( 160 * 1024 ) )    /* 160 Kbytes. */
 #define configMAX_TASK_NAME_LEN                      ( 16 )

examples/evkbmimxrt1060/shadow/include/core_mqtt_agent_config.h

@@ -0,0 +1,2 @@
+/* An empty config file for the CBMC proofs to compile with the default
+ * definitions of configuration macros. */

examples/evkbmimxrt1060/shadow/main.c

@@ -51,7 +51,7 @@
 
 #include "ksdk_mbedtls.h"
 
-#include "nxlog_App.h"
+#include "nxLog_App.h"
 #include "mflash_drv.h"
 
 #include "ex_sss_boot.h"

examples/evkbmimxrt1060/shadow/shadow_device_task.c

@@ -148,7 +148,7 @@
  * functions. shadowexampleMS_TO_WAIT_FOR_NOTIFICATION defines the time, in ticks,
  * to wait for such a callback.
  */
-#define shadowexampleMS_TO_WAIT_FOR_NOTIFICATION       ( 5000 )
+#define shadowexampleMS_TO_WAIT_FOR_NOTIFICATION       ( 15000 )
 
 /**
  * @brief The maximum amount of time in milliseconds to wait for the commands

examples/evkbmimxrt1060/shadow/shadow_update_task.c

@@ -147,7 +147,7 @@
  * functions. shadowexampleMS_TO_WAIT_FOR_NOTIFICATION defines the time, in ticks,
  * to wait for such a callback.
  */
-#define shadowexampleMS_TO_WAIT_FOR_NOTIFICATION       ( 5000 )
+#define shadowexampleMS_TO_WAIT_FOR_NOTIFICATION       ( 15000 )
 
 /**
  * @brief The maximum amount of time in milliseconds to wait for the commands

examples/evkbmimxrt1060/test/app_main.c

@@ -94,6 +94,32 @@ int RunDeviceAdvisorDemo( void )
     return ( xResult == pdPASS ) ? 0 : -1;
 }
 
+int RunOtaE2eDemo( void )
+{
+    BaseType_t xResult = pdFAIL;
+
+    if( xGetMQTTAgentState() < MQTT_AGENT_STATE_INITIALIZED )
+    {
+        xResult = xMQTTAgentInit( appmainMQTT_AGENT_TASK_STACK_SIZE, appmainMQTT_AGENT_TASK_PRIORITY );
+    }
+    else
+    {
+        xResult = pdPASS;
+    }
+
+    if( xResult == pdPASS )
+    {
+        xResult = xTaskCreate( vOTAUpdateTask,
+                               "OTA",
+                               appmainMQTT_OTA_UPDATE_TASK_STACK_SIZE,
+                               NULL,
+                               appmainMQTT_OTA_UPDATE_TASK_PRIORITY,
+                               NULL );
+    }
+
+    return ( xResult == pdPASS ) ? 0 : -1;
+}
+
 int app_main( void )
 {
     BaseType_t xResult = pdFAIL;
@@ -119,25 +145,6 @@ int app_main( void )
     }
 #endif /* if ( appmainPROVISIONING_MODE == 1 ) */
 
-#if ( OTA_E2E_TEST_ENABLED == 1 )
-    {
-        if( xResult == pdPASS )
-        {
-            xResult = xMQTTAgentInit( appmainMQTT_AGENT_TASK_STACK_SIZE, appmainMQTT_AGENT_TASK_PRIORITY );
-        }
-
-        if( xResult == pdPASS )
-        {
-            xResult = xTaskCreate( vOTAUpdateTask,
-                                   "OTA",
-                                   appmainMQTT_OTA_UPDATE_TASK_STACK_SIZE,
-                                   NULL,
-                                   appmainMQTT_OTA_UPDATE_TASK_PRIORITY,
-                                   NULL );
-        }
-    }
-#endif /* if ( OTA_E2E_TEST_ENABLED == 1 ) */
-
     {
         if( xResult == pdPASS )
         {

examples/evkbmimxrt1060/test/include/FreeRTOSConfig.h

@@ -58,7 +58,7 @@ extern void vLoggingPrintf( const char * pcFormat,
 #define configUSE_DAEMON_TASK_STARTUP_HOOK           1
 #define configCPU_CLOCK_HZ                           ( SystemCoreClock )
 #define configTICK_RATE_HZ                           ( ( TickType_t ) 1000 )
-#define configMAX_PRIORITIES                         ( 7 )
+#define configMAX_PRIORITIES                         ( 9 )
 #define configMINIMAL_STACK_SIZE                     ( ( uint16_t ) 90 )
 #define configTOTAL_HEAP_SIZE                        ( ( size_t ) ( 160 * 1024 ) )    /* 160 Kbytes. */
 #define configMAX_TASK_NAME_LEN                      ( 16 )

examples/evkbmimxrt1060/test/include/core_mqtt_agent_config.h

@@ -0,0 +1,2 @@
+/* An empty config file for the CBMC proofs to compile with the default
+ * definitions of configuration macros. */

examples/evkbmimxrt1060/test/include/test_execution_config.h

@@ -40,6 +40,7 @@
  *
  * #define MQTT_TEST_ENABLED                 (0)
  */
+#define MQTT_TEST_ENABLED              ( 0 )
 
 /**
  * @brief Configuration to enable the transport interface test.

examples/evkbmimxrt1060/test/include/test_param_config.h

@@ -52,12 +52,29 @@
  */
 #define MQTT_SERVER_PORT        ( 8883 )
 
+/**
+ * @brief The MQTT client identifier used in MQTT test.  Each client identifier
+ * must be unique; so edit as required to ensure that no two clients connecting to
+ * the same broker use the same client identifier.
+ *
+ * #define MQTT_TEST_CLIENT_IDENTIFIER				"insert here."
+ */
+
+/**
+ * @brief Network buffer size specified in bytes. Must be large enough to hold the maximum
+ * anticipated MQTT payload.
+ *
+ * #define MQTT_TEST_NETWORK_BUFFER_SIZE			( 5000 )
+ */
+#define MQTT_TEST_NETWORK_BUFFER_SIZE    ( 5000 )
+
 /**
  * @brief Endpoint of the echo server to connect to in transport interface test.
  *
  * #define ECHO_SERVER_ENDPOINT   "PLACE_HOLDER"
  */
 
+
 /**
  * @brief Port of the echo server to connect to in transport interface test.
  *
@@ -141,17 +158,25 @@
  */
 #define OTA_PAL_USE_FILE_SYSTEM                          0
 
+/**
+ * @brief The IoT Thing name for the device for OTA test and MQTT test.
+ *
+ * #define IOT_THING_NAME  "PLACE_HOLDER"
+ */
+#define IOT_THING_NAME                                   "PLACE_HOLDER"
+
 /**
  * @brief 1 if using PKCS #11 to access the code sign certificate from NVM.
  */
 #define OTA_PAL_READ_CERTIFICATE_FROM_NVM_WITH_PKCS11    0
 
-#define IOT_THING_NAME                                   "PLACE_HOLDER"
-
 #define OTA_APP_VERSION_MAJOR                            0
 
 #define OTA_APP_VERSION_MINOR                            9
 
 #define OTA_APP_VERSION_BUILD                            1
 
+#define OUTGOING_PUBLISH_RECORD_COUNT                    ( 10 )
+#define INCOMING_PUBLISH_RECORD_COUNT                    ( 10 )
+
 #endif /* TEST_PARAM_CONFIG_H */