Bump coreMQTT and update project files to use new location of transpo…

…rt_interface.h file (#2657)
aws · Oct 29, 2020 · b9a488b · b9a488b
1 parent e4a3cfb
commit b9a488b
Show file tree

Hide file tree

Showing 58 changed files with 103 additions and 428 deletions.
diff --git a/libraries/abstractions/platform/CMakeLists.txt b/libraries/abstractions/platform/CMakeLists.txt
@@ -10,7 +10,6 @@ afr_module_sources(
         "${inc_dir}/platform/iot_clock.h"
         "${inc_dir}/platform/iot_network.h"
         "${inc_dir}/platform/iot_threads.h"
-        "${inc_dir}/platform/transport_interface.h"
         "${inc_dir}/types/iot_platform_types.h"
         "${src_dir}/iot_clock_freertos.c"
         "${src_dir}/iot_threads_freertos.c"
@@ -36,7 +35,6 @@ if(TARGET AFR::secure_sockets::mcu_port)
         ${AFR_CURRENT_MODULE}
         PRIVATE
         "${inc_dir}/platform/iot_metrics.h"
-        "${inc_dir}/platform/transport_interface.h"
         "${src_dir}/iot_metrics.c"
         "${src_dir}/iot_network_freertos.c"
         "${src_dir}/include/platform/iot_network_freertos.h"

diff --git a/libraries/abstractions/platform/include/platform/transport_interface.h b/libraries/abstractions/platform/include/platform/transport_interface.h
diff --git a/libraries/abstractions/transport/transport_interface.cmake b/libraries/abstractions/transport/transport_interface.cmake
@@ -3,9 +3,9 @@
 # to choose coreHTTP instead of coreMQTT. In this case, it is necessary to check
 # for the existence of the file in the downloaded software package.
 if( EXISTS ${AFR_MODULES_DIR}/coreMQTT/source )
-    set(transport_interface_dir "${AFR_MODULES_DIR}/coreMQTT/source/portable")
+    set(transport_interface_dir "${AFR_MODULES_DIR}/coreMQTT/source/interface")
 elseif( EXISTS ${AFR_MODULES_DIR}/coreHTTP/source )
-    set(transport_interface_dir "${AFR_MODULES_DIR}/coreHTTP/source/portable")
+    set(transport_interface_dir "${AFR_MODULES_DIR}/coreHTTP/source/interface")
 else()
     message( FATAL_ERROR "No transport_interface.h exists for this included interface.")
 endif()
diff --git a/libraries/coreMQTT b/libraries/coreMQTT
diff --git a/projects/cypress/CY8CKIT_064S0S2_4343W/mtb/aws_demos/afr.mk b/projects/cypress/CY8CKIT_064S0S2_4343W/mtb/aws_demos/afr.mk
@@ -327,14 +327,14 @@ INCLUDES+=\
 	$(CY_AFR_ROOT)/libraries/c_sdk/standard/mqtt/src\
 	$(CY_AFR_ROOT)/libraries/c_sdk/standard/mqtt/src/private\
 	$(CY_AFR_ROOT)/libraries/coreMQTT/source/include\
-	$(CY_AFR_ROOT)/libraries/coreMQTT/source/portable\
+	$(CY_AFR_ROOT)/libraries/coreMQTT/source/interface\
 	$(CY_AFR_ROOT)/libraries/c_sdk/standard/serializer\
 	$(CY_AFR_ROOT)/libraries/c_sdk/standard/serializer/include\
 	$(CY_AFR_ROOT)/libraries/c_sdk/aws/shadow/include\
 	$(CY_AFR_ROOT)/libraries/c_sdk/aws/shadow/include/types\
 	$(CY_AFR_ROOT)/libraries/c_sdk/aws/defender/include\
 	$(CY_AFR_ROOT)/libraries/coreMQTT/source/include\
-	$(CY_AFR_ROOT)/libraries/coreMQTT/source/portable\
+	$(CY_AFR_ROOT)/libraries/coreMQTT/source/interface\
 	$(CY_AFR_ROOT)/libraries/device_shadow_for_aws_iot_embedded_sdk/source/include\
 	$(CY_AFR_ROOT)/libraries/coreJSON/source/include\
 

diff --git a/projects/cypress/CY8CKIT_064S0S2_4343W/mtb/aws_tests/afr.mk b/projects/cypress/CY8CKIT_064S0S2_4343W/mtb/aws_tests/afr.mk
@@ -351,7 +351,7 @@ INCLUDES+=\
 	$(CY_AFR_ROOT)/libraries/c_sdk/standard/mqtt/test/mock\
 	$(CY_AFR_ROOT)/libraries/c_sdk/standard/mqtt/test/access\
 	$(CY_AFR_ROOT)/libraries/coreMQTT/source/include\
-	$(CY_AFR_ROOT)/libraries/coreMQTT/source/portable\
+	$(CY_AFR_ROOT)/libraries/coreMQTT/source/interface\
 	$(CY_AFR_ROOT)/libraries/c_sdk/standard/ble/include\
 	$(CY_AFR_ROOT)/libraries/c_sdk/standard/serializer\
 	$(CY_AFR_ROOT)/libraries/c_sdk/standard/serializer/include\
@@ -363,7 +363,7 @@ INCLUDES+=\
 	$(CY_AFR_ROOT)/libraries/c_sdk/aws/defender/src\
 	$(CY_AFR_ROOT)/libraries/c_sdk/aws/defender/src/private\
 	$(CY_AFR_ROOT)/libraries/coreMQTT/source/include\
-	$(CY_AFR_ROOT)/libraries/coreMQTT/source/portable\
+	$(CY_AFR_ROOT)/libraries/coreMQTT/source/interface\
 	$(CY_AFR_ROOT)/libraries/device_shadow_for_aws_iot_embedded_sdk/source/include\
 	$(CY_AFR_ROOT)/libraries/coreJSON/source/include\
 

diff --git a/projects/infineon/xmc4800_iotkit/dave4/aws_demos/.cproject b/projects/infineon/xmc4800_iotkit/dave4/aws_demos/.cproject
@@ -58,7 +58,7 @@
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/aws/defender/include"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/include"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/include"/>
-									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/portable"/>
+									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/interface"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/retry_utils"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/transport/secure_sockets"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/serializer/include"/>

diff --git a/projects/infineon/xmc4800_iotkit/dave4/aws_demos/.project b/projects/infineon/xmc4800_iotkit/dave4/aws_demos/.project
@@ -548,11 +548,6 @@
 			<type>1</type>
 			<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/iot_threads.h</locationURI>
 		</link>
-		<link>
-			<name>libraries/abstractions/platform/include/platform/transport_interface.h</name>
-			<type>1</type>
-			<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/transport_interface.h</locationURI>
-		</link>
 		<link>
 			<name>libraries/abstractions/platform/include/types/iot_platform_types.h</name>
 			<type>1</type>
@@ -864,9 +859,9 @@
 			<locationURI>AFR_HOME/libraries/coreMQTT/source/include/core_mqtt_state.h</locationURI>
 		</link>
 		<link>
-			<name>libraries/coreMQTT/source/portable/transport_interface.h</name>
+			<name>libraries/coreMQTT/source/interface/transport_interface.h</name>
 			<type>1</type>
-			<locationURI>AFR_HOME/libraries/coreMQTT/source/portable/transport_interface.h</locationURI>
+			<locationURI>AFR_HOME/libraries/coreMQTT/source/interface/transport_interface.h</locationURI>
 		</link>
 		<link>
 			<name>libraries/core_mqtt_demo_dependencies.cmake</name>

diff --git a/projects/infineon/xmc4800_iotkit/dave4/aws_tests/.cproject b/projects/infineon/xmc4800_iotkit/dave4/aws_tests/.cproject
@@ -62,7 +62,7 @@
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/include"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/src"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/include"/>
-									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/portable"/>
+									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/interface"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/retry_utils"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/transport/secure_sockets"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/serializer/include"/>

diff --git a/projects/infineon/xmc4800_iotkit/dave4/aws_tests/.project b/projects/infineon/xmc4800_iotkit/dave4/aws_tests/.project
@@ -538,11 +538,6 @@
 			<type>1</type>
 			<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/iot_threads.h</locationURI>
 		</link>
-		<link>
-			<name>libraries/abstractions/platform/include/platform/transport_interface.h</name>
-			<type>1</type>
-			<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/transport_interface.h</locationURI>
-		</link>
 		<link>
 			<name>libraries/abstractions/platform/include/types/iot_platform_types.h</name>
 			<type>1</type>
@@ -854,9 +849,9 @@
 			<locationURI>AFR_HOME/libraries/coreMQTT/source/include/core_mqtt_state.h</locationURI>
 		</link>
 		<link>
-			<name>libraries/coreMQTT/source/portable/transport_interface.h</name>
+			<name>libraries/coreMQTT/source/interface/transport_interface.h</name>
 			<type>1</type>
-			<locationURI>AFR_HOME/libraries/coreMQTT/source/portable/transport_interface.h</locationURI>
+			<locationURI>AFR_HOME/libraries/coreMQTT/source/interface/transport_interface.h</locationURI>
 		</link>
 		<link>
 			<name>libraries/core_mqtt_demo_dependencies.cmake</name>

diff --git a/projects/infineon/xmc4800_plus_optiga_trust_x/dave4/aws_demos/.cproject b/projects/infineon/xmc4800_plus_optiga_trust_x/dave4/aws_demos/.cproject
@@ -63,7 +63,7 @@
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/aws/defender/include"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/include"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/include"/>
-									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/portable"/>
+									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/interface"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/retry_utils"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/transport/secure_sockets"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/serializer/include"/>

diff --git a/projects/infineon/xmc4800_plus_optiga_trust_x/dave4/aws_demos/.project b/projects/infineon/xmc4800_plus_optiga_trust_x/dave4/aws_demos/.project
@@ -1103,11 +1103,6 @@
 			<type>1</type>
 			<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/iot_threads.h</locationURI>
 		</link>
-		<link>
-			<name>libraries/abstractions/platform/include/platform/transport_interface.h</name>
-			<type>1</type>
-			<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/transport_interface.h</locationURI>
-		</link>
 		<link>
 			<name>libraries/abstractions/platform/include/types/iot_platform_types.h</name>
 			<type>1</type>
@@ -1404,9 +1399,9 @@
 			<locationURI>AFR_HOME/libraries/coreMQTT/source/include/core_mqtt_state.h</locationURI>
 		</link>
 		<link>
-			<name>libraries/coreMQTT/source/portable/transport_interface.h</name>
+			<name>libraries/coreMQTT/source/interface/transport_interface.h</name>
 			<type>1</type>
-			<locationURI>AFR_HOME/libraries/coreMQTT/source/portable/transport_interface.h</locationURI>
+			<locationURI>AFR_HOME/libraries/coreMQTT/source/interface/transport_interface.h</locationURI>
 		</link>
 		<link>
 			<name>libraries/core_mqtt_demo_dependencies.cmake</name>

diff --git a/projects/infineon/xmc4800_plus_optiga_trust_x/dave4/aws_tests/.cproject b/projects/infineon/xmc4800_plus_optiga_trust_x/dave4/aws_tests/.cproject
@@ -67,7 +67,7 @@
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/include"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/src"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/include"/>
-									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/portable"/>
+									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/interface"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/retry_utils"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/transport/secure_sockets"/>
 									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/serializer/include"/>
+1 −1		.github/workflows/ci.yml
+1 −1		docs/doxygen/config.doxyfile
+1 −1		mqttFilePaths.cmake
+0 −0		source/interface/transport_interface.h
+5 −1		test/cbmc/.gitignore
+1 −1		test/cbmc/aws-templates-for-cbmc-proofs
+1 −1		test/cbmc/litani
+1 −0		test/cbmc/proofs/MQTT_Connect/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_Connect/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_DeserializeAck/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_DeserializeAck/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_DeserializePublish/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_DeserializePublish/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_Disconnect/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_Disconnect/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_GetIncomingPacketTypeAndLength/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_GetIncomingPacketTypeAndLength/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_GetPacketId/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_GetPacketId/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_GetSubAckStatusCodes/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_GetSubAckStatusCodes/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_Init/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_Init/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_MatchTopic/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_MatchTopic/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_Ping/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_Ping/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_ProcessLoop/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_ProcessLoop/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_Publish/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_Publish/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_ReceiveLoop/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_ReceiveLoop/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_SerializeAck/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_SerializeAck/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_SerializeConnect/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_SerializeConnect/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_SerializeDisconnect/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_SerializeDisconnect/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_SerializePingreq/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_SerializePingreq/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_SerializePublish/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_SerializePublish/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_SerializePublishHeader/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_SerializePublishHeader/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_SerializeSubscribe/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_SerializeSubscribe/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_SerializeUnsubscribe/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_SerializeUnsubscribe/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_Subscribe/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_Subscribe/wellspring.txt
+1 −0		test/cbmc/proofs/MQTT_Unsubscribe/cbmc-proof.txt
+0 −1		test/cbmc/proofs/MQTT_Unsubscribe/wellspring.txt
+6 −4		test/cbmc/proofs/Makefile-project-defines
+0 −1		test/cbmc/proofs/prepare.py
+47 −68		test/cbmc/proofs/run-cbmc-proofs.py
+21 −28		test/unit-test/core_mqtt_utest.c