v6.0.2 update for Azure RTOS (#138)

* update tls_setup to allocation space for server certificates.
* move azure_iot_preview to beta3
* disable ASC
* dont use second ram bank for 475

Author: ryanwinter

MXChip/AZ3166/app/main.c

@@ -6,9 +6,9 @@
 #include "tx_api.h"
 
 #include "board_init.h"
+#include "cmsis_utils.h"
 #include "screen.h"
 #include "sntp_client.h"
-#include "cmsis_utils.h"
 
 #include "mqtt.h"
 #include "nx_client.h"
@@ -17,13 +17,13 @@
 #include "azure_config.h"
 
 #define AZURE_THREAD_STACK_SIZE 4096
-#define AZURE_THREAD_PRIORITY 4
+#define AZURE_THREAD_PRIORITY   4
 
 TX_THREAD azure_thread;
 ULONG azure_thread_stack[AZURE_THREAD_STACK_SIZE / sizeof(ULONG)];
 
 void azure_thread_entry(ULONG parameter);
-void tx_application_define(void *first_unused_memory);
+void tx_application_define(void* first_unused_memory);
 
 void azure_thread_entry(ULONG parameter)
 {
@@ -66,16 +66,21 @@ void azure_thread_entry(ULONG parameter)
     }
 }
 
-void tx_application_define(void *first_unused_memory)
+void tx_application_define(void* first_unused_memory)
 {
     systick_interval_set(TX_TIMER_TICKS_PER_SECOND);
 
     // Create Azure thread
-    UINT status = tx_thread_create(&azure_thread, "Azure Thread",
-                              azure_thread_entry, 0,
-                              azure_thread_stack, AZURE_THREAD_STACK_SIZE,
-                              AZURE_THREAD_PRIORITY, AZURE_THREAD_PRIORITY,
-                              TX_NO_TIME_SLICE, TX_AUTO_START);
+    UINT status = tx_thread_create(&azure_thread,
+        "Azure Thread",
+        azure_thread_entry,
+        0,
+        azure_thread_stack,
+        AZURE_THREAD_STACK_SIZE,
+        AZURE_THREAD_PRIORITY,
+        AZURE_THREAD_PRIORITY,
+        TX_NO_TIME_SLICE,
+        TX_AUTO_START);
 
     if (status != TX_SUCCESS)
     {

MXChip/AZ3166/lib/CMakeLists.txt

@@ -12,6 +12,10 @@ set(TX_USER_FILE "${CMAKE_CURRENT_LIST_DIR}/threadx/tx_user.h" CACHE STRING "Ena
 set(NX_USER_FILE "${CMAKE_CURRENT_LIST_DIR}/netxduo/nx_user.h" CACHE STRING "Enable NX user configuration")
 set(NXD_ENABLE_FILE_SERVERS OFF CACHE BOOL "Disable fileX dependency by netxduo")
 
+# Disable ASC
+set(NX_AZURE_DISABLE_IOT_SECURITY_MODULE ON CACHE BOOL "Disable ASC")
+
+# Core libraries
 add_subdirectory(${CORE_LIB_DIR}/threadx threadx)
 add_subdirectory(${CORE_LIB_DIR}/netxduo netxduo)
 add_subdirectory(${CORE_LIB_DIR}/azure-iot-preview/nx_cloud nx_cloud)

Microchip/ATSAME54-XPRO/lib/CMakeLists.txt

@@ -12,6 +12,9 @@ set(TX_USER_FILE "${CMAKE_CURRENT_LIST_DIR}/threadx/tx_user.h" CACHE STRING "Ena
 set(NX_USER_FILE "${CMAKE_CURRENT_LIST_DIR}/netxduo/nx_user.h" CACHE STRING "Enable NX user configuration")
 set(NXD_ENABLE_FILE_SERVERS OFF CACHE BOOL "Disable fileX dependency by netxduo")
 
+# Disable ASC
+set(NX_AZURE_DISABLE_IOT_SECURITY_MODULE ON CACHE BOOL "Disable ASC")
+
 # Core libraries
 add_subdirectory(${CORE_LIB_DIR}/threadx threadx)
 add_subdirectory(${CORE_LIB_DIR}/netxduo netxduo)

NXP/MIMXRT1060-EVK/app/mqtt.c

@@ -129,7 +129,7 @@ UINT azure_iot_mqtt_entry(NX_IP* ip_ptr, NX_PACKET_POOL* pool_ptr, NX_DNS* dns_p
         sntp_time_get,
         IOT_DPS_ENDPOINT,
         IOT_DPS_ID_SCOPE,
-        IOT_DEVICE_ID,
+        IOT_DPS_REGISTRATION_ID,
         IOT_PRIMARY_KEY,
         IOT_MODEL_ID);
 #else

NXP/MIMXRT1060-EVK/lib/CMakeLists.txt

@@ -12,7 +12,10 @@ set(TX_USER_FILE "${CMAKE_CURRENT_LIST_DIR}/threadx/tx_user.h" CACHE STRING "Ena
 set(NX_USER_FILE "${CMAKE_CURRENT_LIST_DIR}/netxduo/nx_user.h" CACHE STRING "Enable NX user configuration")
 set(NXD_ENABLE_FILE_SERVERS OFF CACHE BOOL "Disable fileX dependency by netxduo")
 
-# Azure RTOS
+# Disable ASC
+set(NX_AZURE_DISABLE_IOT_SECURITY_MODULE ON CACHE BOOL "Disable ASC")
+
+# Core libraries
 add_subdirectory(${CORE_LIB_DIR}/threadx threadx)
 add_subdirectory(${CORE_LIB_DIR}/netxduo netxduo)
 add_subdirectory(${CORE_LIB_DIR}/azure-iot-preview/nx_cloud nx_cloud)

STMicroelectronics/STM32L4_L4+/app/startup/STM32L475VGTx_FLASH.ld

@@ -36,8 +36,8 @@ ENTRY(Reset_Handler)
 _estack = 0x20018000;    /* end of RAM */
 
 /* Generate a link error if heap and stack don't fit into RAM */
-_Min_Heap_Size = 0x7000;      /* required amount of heap  */
-_Min_Stack_Size = 0x1000; /* required amount of stack */
+_Min_Heap_Size = 0x400;      /* required amount of heap  */
+_Min_Stack_Size = 0x800; /* required amount of stack */
 
 /* Set the RAM segment used end for threadx */
 __RAM_segment_used_end__ = 0; 
@@ -170,9 +170,7 @@ SECTIONS
     . = . + _Min_Heap_Size;
     . = . + _Min_Stack_Size;
     . = ALIGN(8);
-  } >RAM2
-
-  
+  } >RAM
 
   /* Remove information from the standard libraries */
   /DISCARD/ :

STMicroelectronics/STM32L4_L4+/lib/CMakeLists.txt

@@ -12,6 +12,10 @@ set(TX_USER_FILE "${CMAKE_CURRENT_LIST_DIR}/threadx/tx_user.h" CACHE STRING "Ena
 set(NX_USER_FILE "${CMAKE_CURRENT_LIST_DIR}/netxduo/nx_user.h" CACHE STRING "Enable NX user configuration")
 set(NXD_ENABLE_FILE_SERVERS OFF CACHE BOOL "Disable fileX dependency by netxduo")
 
+# Disable ASC
+set(NX_AZURE_DISABLE_IOT_SECURITY_MODULE ON CACHE BOOL "Disable ASC")
+
+# Core libraries
 add_subdirectory(${CORE_LIB_DIR}/threadx threadx)
 add_subdirectory(${CORE_LIB_DIR}/azure-iot-preview/nx_cloud nx_cloud)
 add_subdirectory(${CORE_LIB_DIR}/azure-iot-preview/azure_iot azure_iot)

core/lib/azure-iot-preview

@@ -103,7 +103,27 @@ UINT tls_setup(NXD_MQTT_CLIENT* client,
         sizeof(azure_iot_mqtt->tls_metadata_buffer));
     if (status != NX_SUCCESS)
     {
-        printf("Failed to create TLS session status: %d\r\n", status);
+        printf("Failed to create TLS session status (0x%04x)\r\n", status);
+        return status;
+    }
+
+    status = nx_secure_tls_remote_certificate_allocate(tls_session,
+        &azure_iot_mqtt->mqtt_remote_certificate,
+        azure_iot_mqtt->mqtt_remote_cert_buffer,
+        sizeof(azure_iot_mqtt->mqtt_remote_cert_buffer));
+    if (status != NX_SUCCESS)
+    {
+        printf("Failed to create remote certificate buffer (0x%04x)\r\n", status);
+        return status;
+    }
+
+    status = nx_secure_tls_remote_certificate_allocate(tls_session,
+        &azure_iot_mqtt->mqtt_remote_issuer,
+        azure_iot_mqtt->mqtt_remote_issuer_buffer,
+        sizeof(azure_iot_mqtt->mqtt_remote_issuer_buffer));
+    if (status != NX_SUCCESS)
+    {
+        printf("Failed to create remote issuer buffer (0x%04x)\r\n", status);
         return status;
     }
 
@@ -118,14 +138,14 @@ UINT tls_setup(NXD_MQTT_CLIENT* client,
         NX_SECURE_X509_KEY_TYPE_NONE);
     if (status != NX_SUCCESS)
     {
-        printf("Unable to initialize CA certificate (0x%02x)\r\n", status);
+        printf("Unable to initialize CA certificate (0x%04x)\r\n", status);
         return status;
     }
 
     status = nx_secure_tls_trusted_certificate_add(tls_session, trusted_cert);
     if (status != NX_SUCCESS)
     {
-        printf("Unable to add CA certificate to trusted store (0x%02x)\r\n", status);
+        printf("Unable to add CA certificate to trusted store (0x%04x)\r\n", status);
         return status;
     }
 

core/src/azure_iot_mqtt/azure_iot_mqtt.c

@@ -23,8 +23,9 @@
 #define AZURE_IOT_MQTT_DIRECT_COMMAND_RID_SIZE 6
 
 #define AZURE_IOT_MQTT_CLIENT_STACK_SIZE 4096
+#define AZURE_IOT_MQTT_CERT_BUFFER_SIZE 4096
 
-#define TLS_PACKET_BUFFER (5 * 1024)
+#define TLS_PACKET_BUFFER 4096
 
 #define MQTT_QOS_0 0 // QoS 0 - Deliver at most once
 #define MQTT_QOS_1 1 // QoS 1 - Deliver at least once
@@ -77,6 +78,11 @@ struct AZURE_IOT_MQTT_STRUCT
     ULONG tls_metadata_buffer[NX_AZURE_IOT_TLS_METADATA_BUFFER_SIZE / sizeof(ULONG)];
     UCHAR tls_packet_buffer[TLS_PACKET_BUFFER];
 
+    NX_SECURE_X509_CERT mqtt_remote_certificate;
+    NX_SECURE_X509_CERT mqtt_remote_issuer;
+    UCHAR mqtt_remote_cert_buffer[AZURE_IOT_MQTT_CERT_BUFFER_SIZE];
+    UCHAR mqtt_remote_issuer_buffer[AZURE_IOT_MQTT_CERT_BUFFER_SIZE];
+
     func_ptr_direct_method cb_ptr_mqtt_invoke_direct_method;
     func_ptr_c2d_message cb_ptr_mqtt_c2d_message;
     func_ptr_device_twin_desired_prop cb_ptr_mqtt_device_twin_desired_prop_callback;