app: add a secure crypt container for secureshield app

Signed-off-by: Yiping Peng <yibingp@synopsys.com>

Author: BabaYB

aws_iot_smarthome_secureshield/src/container_cfg.c

@@ -29,11 +29,12 @@
 --------------------------------------------- */
 
 #include "embARC.h"
-#include "device.h"
+#include "device_container.h"
+#include "secure/crypt_container.h"
 
 #define PERIPHERAL_ADDR_BASE 0xf0000000
 
-static CONTAINER_AC_TABLE device_container_act[] = {
+static CONTAINER_AC_TABLE g_device_container_act[] = {
 	{smarthome_init, 0, SECURESHIELD_AC_INTERFACE},
 	{smarthome_close, 0, SECURESHIELD_AC_INTERFACE},
 	{getRoomTemperature, 1, SECURESHIELD_AC_INTERFACE},
@@ -43,6 +44,13 @@ static CONTAINER_AC_TABLE device_container_act[] = {
 	{(void *)(PERIPHERAL_ADDR_BASE + REL_REGBASE_I2C0), 0x1000, SECURESHIELD_ACDEF_UPERIPH}
  };
 
+static CONTAINER_AC_TABLE g_crypt_container_act[] = {
+	{init_crypt, 0, SECURESHIELD_AC_INTERFACE},
+	{close_crypt, 0, SECURESHIELD_AC_INTERFACE},
+	{operate_encrypt, 4, SECURESHIELD_AC_INTERFACE},
+	{operate_decrypt, 4, SECURESHIELD_AC_INTERFACE}
+ };
+
 static CONTAINER_AC_TABLE g_main_container_act[] = {
 	/* PINMUX, UART1 and GPIO0 are required */
 	{(void *)(PERIPHERAL_ADDR_BASE + REL_REGBASE_PINMUX), 0x1000, SECURESHIELD_ACDEF_UPERIPH},
@@ -65,4 +73,7 @@ static CONTAINER_AC_TABLE g_main_container_act[] = {
 SECURESHIELD_CONTAINER_BACKGROUND(g_main_container_act);
 
 /* configure the other container */
-SECURESHIELD_CONTAINER_CONFIG(device_container, device_container_act, 1024);
+SECURESHIELD_CONTAINER_CONFIG(device_container, g_device_container_act, 1024);
+
+/* crypt container is secure container, it has access to most of the system resources */
+SECURESHIELD_CONTAINER_CONFIG(crypt_container, g_crypt_container_act, 4096, SECURESHIELD_CONTAINER_SECURE);

aws_iot_smarthome_secureshield/src/device.c renamed to aws_iot_smarthome_secureshield/src/device_container.c

@@ -34,7 +34,7 @@
 #include "embARC_debug.h"
 #include "embARC_assert.h"
 
-#include "device.h"
+#include "device_container.h"
 
 #include "adt7420.h"
 

aws_iot_smarthome_secureshield/src/device.h renamed to aws_iot_smarthome_secureshield/src/device_container.h

@@ -110,15 +110,15 @@
 #include <sys/time.h>
 #include <limits.h>
 
-
 #include "aws_iot_config.h"
 #include "aws_iot_log.h"
 #include "aws_iot_version.h"
 #include "aws_iot_mqtt_client_interface.h"
 #include "aws_iot_shadow_interface.h"
 
 #include "embARC.h"
-#include "device.h"
+#include "device_container.h"
+#include "secure/crypt_container.h"
 
 #if defined(AWSDEMO_HAVE_OLED) && defined(MID_U8GLIB)
 #include "u8g.h"
@@ -135,6 +135,9 @@
 
 #define MAX_LENGTH_OF_UPDATE_JSON_BUFFER        512
 
+// use crypt container to encrypt upload data
+#define ENCRYPT_UPLOAD_DATA	true
+
 //#define SIMULATE_TEMPERATURE
 
 #define CERT_ROOTDIR                            "cert/smarthome"
@@ -149,6 +152,10 @@ static bool LivingRoomLights_updated = false;
 
 static char JsonDocumentBuffer[MAX_LENGTH_OF_UPDATE_JSON_BUFFER];
 static size_t sizeOfJsonDocumentBuffer = sizeof(JsonDocumentBuffer) / sizeof(JsonDocumentBuffer[0]);
+#if ENCRYPT_UPLOAD_DATA
+static char JsonDocumentBufferCipher[MAX_LENGTH_OF_UPDATE_JSON_BUFFER];
+static char JsonDocumentBufferDeCipher[MAX_LENGTH_OF_UPDATE_JSON_BUFFER];
+#endif
 
 static float temperature = STARTING_ROOMTEMPERATURE;
 static bool DoorLocked = false;
@@ -201,8 +208,8 @@ static void u8g_draw(void)
 
 		u8g_DrawStr(&u8g, 35, 0, "SmartHome");
 
-                sprintf(strbuf, "Connection: %s", ConnectionStatus ? "ok" : "lost");
-                u8g_DrawStr(&u8g, 15, 10, (const char*)strbuf);
+		sprintf(strbuf, "Connection: %s", ConnectionStatus ? "ok" : "lost");
+		u8g_DrawStr(&u8g, 15, 10, (const char*)strbuf);
 
 		sprintf(strbuf, "Temperature: %.1fC", temperature);
 		u8g_DrawStr(&u8g, 15, 20, (const char*)strbuf);
@@ -261,8 +268,9 @@ void FrontDoorActuate_Callback(const char *pJsonString, uint32_t JsonStringDataL
 	if (pContext != NULL) {
 		bool temp = *(bool *)(pContext->pData);
 		IOT_INFO("Delta - FrontDoor state changed to %d", temp);
-		// delete controlFrontDoor(DoorLocked);
+		vTaskSuspendAll();
 		container_call(device_container, controlFrontDoor, DoorLocked);
+		xTaskResumeAll();
 	}
 }
 
@@ -271,8 +279,9 @@ void KitchenLights_Callback(const char *pJsonString, uint32_t JsonStringDataLen,
 	if (pContext != NULL) {
 		bool temp = *(bool *)(pContext->pData);
 		IOT_INFO("Delta - KitchenLights light state changed to %d", temp);
-		//delete controlKitchenLights(KitchenLights);
+		vTaskSuspendAll();
 		container_call(device_container, controlKitchenLights, KitchenLights);
+		xTaskResumeAll();
 	}
 }
 
@@ -281,8 +290,9 @@ void LivingRoomLights_Callback(const char *pJsonString, uint32_t JsonStringDataL
 	if (pContext != NULL) {
 		bool temp = *(bool *)(pContext->pData);
 		IOT_INFO("Delta - LivingRoomLights light state changed to %d", temp);
-		//delete controlLivingRoomLights(LivingRoomLights);
+		vTaskSuspendAll();
 		container_call(device_container, controlLivingRoomLights, LivingRoomLights);
+		xTaskResumeAll();
 	}
 }
 
@@ -378,7 +388,7 @@ void disconnectCallbackHandler(AWS_IoT_Client *pClient, void *data)
 
 	IOT_UNUSED(data);
 
-        ConnectionStatus = false;
+	ConnectionStatus = false;
 
 	if (aws_iot_is_autoreconnect_enabled(pClient)) {
 		IOT_INFO("Auto Reconnect is enabled, Reconnecting attempt will start now");
@@ -407,7 +417,7 @@ int main(void)
 	DoorLocked_updated = false;
 	KitchenLights_updated = false;
 	LivingRoomLights_updated = false;
-        ConnectionStatus = false;
+	ConnectionStatus = false;
 
 	FrontDoorActuator.cb = FrontDoorActuate_Callback;
 	FrontDoorActuator.pData = &DoorLocked;
@@ -504,19 +514,15 @@ int main(void)
 			IOT_INFO("Shadow Register Delta OK");
 		}
 
+		vTaskSuspendAll();
 #ifndef SIMULATE_TEMPERATURE
-		//delete getRoomTemperature(&temperature);
 		container_call(device_container, getRoomTemperature, &temperature);
 #endif
-		//delete smarthome_init();
 		container_call(device_container, smarthome_init);
-
-		// delete controlFrontDoor(DoorLocked);
 		container_call(device_container, controlFrontDoor, DoorLocked);
-		//delete controlKitchenLights(KitchenLights);
 		container_call(device_container, controlKitchenLights, KitchenLights);
-		//delete controlLivingRoomLights(LivingRoomLights);
 		container_call(device_container, controlLivingRoomLights, LivingRoomLights);
+		xTaskResumeAll();
 
 		last_LivingRoomLights = !LivingRoomLights;
 		last_KitchenLights = !KitchenLights;
@@ -531,32 +537,35 @@ int main(void)
 				// If the client is attempting to reconnect we will skip the rest of the loop.
 				continue;
 			}
-                        ConnectionStatus = true;
+			ConnectionStatus = true;
 			/** Update desired messages */
 			act_idx = 0;
 			if (DoorLocked_updated) {
 				curActuator[act_idx] = &FrontDoorActuator;
 				act_idx ++;
 				DoorLocked = !DoorLocked;
 				DoorLocked_updated = false;
-				// delete controlFrontDoor(DoorLocked);
+				vTaskSuspendAll();
 				container_call(device_container, controlFrontDoor, DoorLocked);
+				xTaskResumeAll();
 			}
 			if (KitchenLights_updated) {
 				curActuator[act_idx] = &KitchenLightsActuator;
 				act_idx ++;
 				KitchenLights = !KitchenLights;
 				KitchenLights_updated = false;
-				//delete controlKitchenLights(KitchenLights);
+				vTaskSuspendAll();
 				container_call(device_container, controlKitchenLights, KitchenLights);
+				xTaskResumeAll();
 			}
 			if (LivingRoomLights_updated) {
 				curActuator[act_idx] = &LivingRoomLightsActuator;
 				act_idx ++;
 				LivingRoomLights = !LivingRoomLights;
 				LivingRoomLights_updated = false;
-				//delete controlLivingRoomLights(LivingRoomLights);
+				vTaskSuspendAll();
 				container_call(device_container, controlLivingRoomLights, LivingRoomLights);
+				xTaskResumeAll();
 			}
 			if (act_idx > 0) {
 				rc = aws_iot_shadow_init_json_document(JsonDocumentBuffer, sizeOfJsonDocumentBuffer);
@@ -575,7 +584,17 @@ int main(void)
 						rc = aws_iot_finalize_json_document(JsonDocumentBuffer, sizeOfJsonDocumentBuffer);
 						if (rc == SUCCESS) {
 							IOT_INFO("Update Shadow Desired: %s", JsonDocumentBuffer);
+#if ENCRYPT_UPLOAD_DATA
+							IOT_INFO("now try to encrypt input:%s len:%d \r\n", JsonDocumentBuffer, sizeOfJsonDocumentBuffer);
+							vTaskSuspendAll();
+							container_call(crypt_container, operate_encrypt, JsonDocumentBuffer, sizeOfJsonDocumentBuffer, \
+												JsonDocumentBufferCipher, &sizeOfJsonDocumentBuffer);
+							xTaskResumeAll();
+							IOT_INFO("result of encrypt output:%s len:%d \r\n", JsonDocumentBufferCipher, sizeOfJsonDocumentBuffer);
+							rc = aws_iot_shadow_update(&mqttClient, AWS_IOT_MY_THING_NAME, JsonDocumentBufferCipher, ShadowUpdateStatusCallback, NULL, 4, true);
+#else
 							rc = aws_iot_shadow_update(&mqttClient, AWS_IOT_MY_THING_NAME, JsonDocumentBuffer, ShadowUpdateStatusCallback, NULL, 4, true);
+#endif
 						}
 					}
 				}
@@ -586,7 +605,9 @@ int main(void)
 				continue;
 			}
 			/** Update reported messages */
+			vTaskSuspendAll();
 			temperature_updated = container_call(device_container, getRoomTemperature, &temperature);
+			xTaskResumeAll();
 
 			rc = aws_iot_shadow_init_json_document(JsonDocumentBuffer, sizeOfJsonDocumentBuffer);
 			if (rc == SUCCESS) {
@@ -600,16 +621,17 @@ int main(void)
 					}
 				}
 			}
-        		u8g_draw();
+			u8g_draw();
 
 			toggleHeartbeatLed();
 
 			IOT_INFO("*****************************************************************************************\n");
 			vTaskDelay(delay_ms);
 		}
 
-		//delete smarthome_close();
+		vTaskSuspendAll();
 		container_call(device_container, smarthome_close);
+		xTaskResumeAll();
 		if (SUCCESS != rc) {
 			IOT_ERROR("An error occurred in the loop %d", rc);
 		}

aws_iot_smarthome_secureshield/src/main.c

@@ -14,7 +14,8 @@ LOG_FLAGS += -DENABLE_IOT_WARN
 LOG_FLAGS += -DENABLE_IOT_ERROR
 
 APPL_DEFINES  = $(LOG_FLAGS) -DMBEDTLS_CONFIG_FILE=\"mbedtls_config.h\" \
-				-DTASK_STACK_SIZE_MAIN=4096*2 -DARC_FEATURE_STACK_CHECK=0
+				-DTASK_STACK_SIZE_MAIN=4096*2 -DARC_FEATURE_STACK_CHECK=0 \
+				-DSECURESHIELD_SECURE_RAM_USAGE=0x1800000
 ## Define whether demo include OLED
 # 1: Yes
 # 0: No
@@ -43,6 +44,14 @@ APPL_ASMSRC_DIR = .
 # application include dirs
 APPL_INC_DIR = .
 
+# application include dirs
+APPL_INC_DIR = . ./secure
+
+
+# the dir where src files should be compiled and linked with secure world
+APPL_SECURE_CSRC_DIR = ./secure
+SECURE_SYMBOL_LIST = ./secure/secure_symbol.txt
+
 # include current project makefile
 COMMON_COMPILE_PREREQUISITES += makefile