diff --git a/.gitmodules b/.gitmodules index 02445bf95..0c721eb1a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,8 +7,8 @@ [submodule "FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP"] path = FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP url = https://github.com/FreeRTOS/FreeRTOS-Plus-TCP -[submodule "FreeRTOS-Plus/Source/AWS/device-shadow-for-aws-iot-embedded-sdk"] - path = FreeRTOS-Plus/Source/AWS/device-shadow-for-aws-iot-embedded-sdk +[submodule "FreeRTOS-Plus/Source/AWS/device-shadow"] + path = FreeRTOS-Plus/Source/AWS/device-shadow url = https://github.com/aws/device-shadow-for-aws-iot-embedded-sdk [submodule "FreeRTOS-Plus/Source/Application-Protocols/coreMQTT"] path = FreeRTOS-Plus/Source/Application-Protocols/coreMQTT diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.c b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.c index 9fb06e48e..dc6172e61 100644 --- a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.c +++ b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.c @@ -53,7 +53,7 @@ #include "retry_utils.h" /* Transport interface implementation include header for TLS. */ -#include "tls_freertos.h" +#include "freertos_plus_tcp_mbedtls.h" /*------------- Demo configurations -------------------------*/ diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.h b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.h index 7d5fd7605..77846c400 100644 --- a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.h +++ b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.h @@ -27,7 +27,7 @@ #include "core_mqtt.h" /* Transport interface implementation include header for TLS. */ -#include "tls_freertos.h" +#include "freertos_plus_tcp_mbedtls.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj index 49e2e8c9b..103669bae 100644 --- a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\..\Source\Application-Protocols\platform\include;..\..\..\..\Source\Application-Protocols\platform\freertos\transport\include;..\..\..\..\Source\Application-Protocols\platform\freertos\mbedtls;..\..\..\..\..\Source\mbedtls_utils;..\..\..\..\ThirdParty\mbedtls\include;..\..\..\..\Source\AWS\device-shadow-for-aws-iot-embedded-sdk\source\include;..\..\..\..\Source\coreJSON\source\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\..\Source\Application-Protocols\platform\transport;..\..\..\..\Source\Application-Protocols\platform\transport\tls\include;..\..\..\..\Source\Application-Protocols\platform\mbedtls;..\..\..\..\..\Source\mbedtls_utils;..\..\..\..\ThirdParty\mbedtls\include;..\..\..\..\Source\AWS\device-shadow\source\include;..\..\..\..\Source\coreJSON\source\include;.;%(AdditionalIncludeDirectories) MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,15 +157,15 @@ - - - - - + + + + + - + TurnOffAllWarnings @@ -519,11 +519,11 @@ - - - - - + + + + + diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj.filters index 9d5561bf9..a80bc2b79 100644 --- a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj.filters @@ -59,16 +59,16 @@ {fcf93295-15e2-4a84-a5e9-b3c162e9f061} - + {8a0aa896-6b3a-49b3-997e-681f0d1949ae} - + {c5a01679-3e7a-4320-97ac-ee5b872c1650} - + {c992824d-4198-46b2-8d59-5f99ab9946ab} - + {6a35782c-bc09-42d5-a850-98bcb668a4dc} @@ -77,7 +77,7 @@ {0dacb84e-5cc3-4eed-8fb1-68b6e4741f77} - + {3dc3c37b-6417-4a84-a16e-b1acf21c04cf} @@ -150,20 +150,20 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport FreeRTOS+\mbedtls\library @@ -412,8 +412,8 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreJSON - - FreeRTOS+\FreeRTOS IoT Libraries\AWS\device-shadow-for-aws-iot-embedded-sdk + + FreeRTOS+\FreeRTOS IoT Libraries\AWS\device-shadow @@ -502,21 +502,21 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\include + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\include + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/DemoTasks/BasicTLSMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/DemoTasks/BasicTLSMQTTExample.c index b3b826c5e..dcbe9bf86 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/DemoTasks/BasicTLSMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/DemoTasks/BasicTLSMQTTExample.c @@ -57,7 +57,7 @@ #include "retry_utils.h" /* Transport interface implementation include header for TLS. */ -#include "tls_freertos.h" +#include "freertos_plus_tcp_mbedtls.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj index 2de95b416..701e55c37 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\include;..\..\..\Source\Application-Protocols\platform\freertos\transport\include;..\..\..\Source\Application-Protocols\platform\freertos\mbedtls;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\platform\transport;..\..\..\Source\Application-Protocols\platform\transport\tls\include;..\..\..\Source\Application-Protocols\platform\mbedtls;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,11 +157,11 @@ - - - - - + + + + + @@ -516,11 +516,11 @@ - - - - - + + + + + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj.filters index 2037889b9..68af3d978 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj.filters @@ -59,16 +59,16 @@ {fcf93295-15e2-4a84-a5e9-b3c162e9f061} - + {8a0aa896-6b3a-49b3-997e-681f0d1949ae} - + {c5a01679-3e7a-4320-97ac-ee5b872c1650} - + {c992824d-4198-46b2-8d59-5f99ab9946ab} - + {6a35782c-bc09-42d5-a850-98bcb668a4dc} @@ -387,20 +387,20 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport @@ -489,7 +489,7 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -733,17 +733,17 @@ FreeRTOS+\mbedtls\include - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\include + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\include + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include \ No newline at end of file diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/DemoTasks/KeepAliveMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/DemoTasks/KeepAliveMQTTExample.c index 87359a41e..490ea6c79 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/DemoTasks/KeepAliveMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/DemoTasks/KeepAliveMQTTExample.c @@ -60,7 +60,7 @@ #include "retry_utils.h" /* Transport interface include. */ -#include "plaintext_freertos.h" +#include "freertos_plus_tcp_plaintext.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj index bbd24c9d5..64a7f25ec 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\include;..\..\..\Source\Application-Protocols\platform\freertos\transport\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\platform\transport;..\..\..\Source\Application-Protocols\platform\transport\plaintext\include;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,9 +157,9 @@ - - - + + + @@ -194,9 +194,9 @@ - + - + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj.filters index 9e60aae8e..035e948c0 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj.filters @@ -120,10 +120,10 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - + FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -210,13 +210,13 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/DemoTasks/MultitaskMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/DemoTasks/MultitaskMQTTExample.c index 09da30b10..d67d555ba 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/DemoTasks/MultitaskMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/DemoTasks/MultitaskMQTTExample.c @@ -75,9 +75,9 @@ /* Transport interface include. */ #if defined( democonfigUSE_TLS ) && ( democonfigUSE_TLS == 1 ) - #include "tls_freertos.h" + #include "freertos_plus_tcp_mbedtls.h" #else - #include "plaintext_freertos.h" + #include "freertos_plus_tcp_plaintext.h" #endif /** diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj index 4662ede6e..c60b6fe5d 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\include;..\..\..\Source\Application-Protocols\platform\freertos\transport\include;..\..\..\Source\Application-Protocols\platform\freertos\mbedtls;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\platform\transport;..\..\..\Source\Application-Protocols\platform\transport\plaintext\include;..\..\..\Source\Application-Protocols\platform\transport\tls\include;..\..\..\Source\Application-Protocols\platform\mbedtls;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,12 +157,12 @@ - - - - - - + + + + + + @@ -517,12 +517,12 @@ - - - - - - + + + + + + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj.filters index b37f7fa2a..5def22f4c 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj.filters @@ -59,16 +59,16 @@ {fcf93295-15e2-4a84-a5e9-b3c162e9f061} - + {8a0aa896-6b3a-49b3-997e-681f0d1949ae} - + {c5a01679-3e7a-4320-97ac-ee5b872c1650} - + {c992824d-4198-46b2-8d59-5f99ab9946ab} - + {6a35782c-bc09-42d5-a850-98bcb668a4dc} @@ -387,23 +387,23 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport @@ -492,7 +492,7 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -736,17 +736,17 @@ FreeRTOS+\mbedtls\include - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\include + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\include + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\include + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include \ No newline at end of file diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c index 629e2710c..9beed57b5 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c @@ -58,7 +58,7 @@ #include "retry_utils.h" /* Transport interface implementation include header for TLS. */ -#include "tls_freertos.h" +#include "freertos_plus_tcp_mbedtls.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj index 7c2ec642b..23407fc38 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\include;..\..\..\Source\Application-Protocols\platform\freertos\transport\include;..\..\..\Source\Application-Protocols\platform\freertos\mbedtls;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\platform\transport;..\..\..\Source\Application-Protocols\platform\transport\tls\include;..\..\..\Source\Application-Protocols\platform\mbedtls;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,11 +157,11 @@ - - - - - + + + + + @@ -516,11 +516,11 @@ - - - - - + + + + + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj.filters index ce1ddbe16..bc0bf6f20 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj.filters @@ -59,16 +59,16 @@ {fcf93295-15e2-4a84-a5e9-b3c162e9f061} - + {8a0aa896-6b3a-49b3-997e-681f0d1949ae} - + {c5a01679-3e7a-4320-97ac-ee5b872c1650} - + {c992824d-4198-46b2-8d59-5f99ab9946ab} - + {6a35782c-bc09-42d5-a850-98bcb668a4dc} @@ -387,20 +387,20 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport @@ -489,7 +489,7 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -733,17 +733,17 @@ FreeRTOS+\mbedtls\include - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\include + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\include + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include \ No newline at end of file diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/DemoTasks/PlaintextMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/DemoTasks/PlaintextMQTTExample.c index 3eec0ad58..da50dc322 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/DemoTasks/PlaintextMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/DemoTasks/PlaintextMQTTExample.c @@ -56,7 +56,7 @@ #include "retry_utils.h" /* Transport interface include. */ -#include "plaintext_freertos.h" +#include "freertos_plus_tcp_plaintext.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj index ed0c51df1..d4bd917a7 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\include;..\..\..\Source\Application-Protocols\platform\freertos\transport\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\platform\transport;..\..\..\Source\Application-Protocols\platform\transport\plaintext\include;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,9 +157,9 @@ - - - + + + @@ -194,9 +194,9 @@ - - - + + + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj.filters index 8a4d7106e..c6d669d39 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj.filters @@ -120,13 +120,13 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - + FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -213,16 +213,16 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj index efc931715..38648230b 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\platform\include;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,7 +157,7 @@ - + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj.filters index 061f240a7..80cb7d34f 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj.filters @@ -114,7 +114,7 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - + FreeRTOS+\FreeRTOS IoT Libraries\platform diff --git a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/DemoTasks/MutualAuthMQTTExample.c b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/DemoTasks/MutualAuthMQTTExample.c index 4c1189b10..49cc2f2a0 100644 --- a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/DemoTasks/MutualAuthMQTTExample.c +++ b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/DemoTasks/MutualAuthMQTTExample.c @@ -53,7 +53,7 @@ #include "core_mqtt.h" /* Transport interface implementation include header for TLS. */ -#include "tls_freertos_pkcs11.h" +#include "freertos_plus_tcp_mbedtls_pkcs11.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj index 177580448..3220f9258 100644 --- a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\FreeRTOS-Plus\Source\Logging;..\coreMQTT_Windows_Simulator\Common;..\coreMQTT_Windows_Simulator\common\WinPCap;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\3rdparty\pkcs11;..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\Source\Application-Protocols\platform\include;..\..\Source\Application-Protocols\platform\freertos\transport\include;..\..\Source\Application-Protocols\platform\freertos\mbedtls;..\..\Source\mbedtls_utils;..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) + ..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\FreeRTOS-Plus\Source\Logging;..\coreMQTT_Windows_Simulator\Common;..\coreMQTT_Windows_Simulator\common\WinPCap;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\3rdparty\pkcs11;..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\Source\Application-Protocols\platform\retry_utils;..\..\Source\Application-Protocols\platform\transport;..\..\Source\Application-Protocols\platform\transport\tls\include;..\..\Source\Application-Protocols\platform\mbedtls;..\..\Source\mbedtls_utils;..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,15 +157,15 @@ - - - - + + + + - + @@ -286,11 +286,11 @@ - - - - - + + + + + diff --git a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters index 0d3c59d05..72d16ca74 100644 --- a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters @@ -59,16 +59,16 @@ {fcf93295-15e2-4a84-a5e9-b3c162e9f061} - + {8a0aa896-6b3a-49b3-997e-681f0d1949ae} - + {c5a01679-3e7a-4320-97ac-ee5b872c1650} - + {c992824d-4198-46b2-8d59-5f99ab9946ab} - + {6a35782c-bc09-42d5-a850-98bcb668a4dc} @@ -166,16 +166,16 @@ coreMQTT - + Transport - + ThirdParty - + Transport - + Transport @@ -452,7 +452,7 @@ ThirdParty\mbedtls - + Transport @@ -541,21 +541,21 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\mbedtls + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\include + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - - FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos\transport\include + + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include coreMQTT diff --git a/FreeRTOS-Plus/Source/AWS/device-shadow b/FreeRTOS-Plus/Source/AWS/device-shadow new file mode 160000 index 000000000..435a2d326 --- /dev/null +++ b/FreeRTOS-Plus/Source/AWS/device-shadow @@ -0,0 +1 @@ +Subproject commit 435a2d32632e7ff437d61d179dd45f0d57c487c2 diff --git a/FreeRTOS-Plus/Source/AWS/device-shadow-for-aws-iot-embedded-sdk b/FreeRTOS-Plus/Source/AWS/device-shadow-for-aws-iot-embedded-sdk deleted file mode 160000 index 8eb6c7d38..000000000 --- a/FreeRTOS-Plus/Source/AWS/device-shadow-for-aws-iot-embedded-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8eb6c7d3842b810eb0d2e9cba9df09d546b31adb diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/mbedtls/mbedtls_error.c b/FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_error.c similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/mbedtls/mbedtls_error.c rename to FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_error.c diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/mbedtls/mbedtls_error.h b/FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_error.h similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/mbedtls/mbedtls_error.h rename to FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_error.h diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/mbedtls/mbedtls_freertos_port.c b/FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_freertos_port.c similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/mbedtls/mbedtls_freertos_port.c rename to FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_freertos_port.c diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/mbedtls/threading_alt.h b/FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/threading_alt.h similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/mbedtls/threading_alt.h rename to FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/threading_alt.h diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/retry_utils/retry_utils_freertos.c b/FreeRTOS-Plus/Source/Application-Protocols/platform/retry_utils/retry_utils.c similarity index 99% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/retry_utils/retry_utils_freertos.c rename to FreeRTOS-Plus/Source/Application-Protocols/platform/retry_utils/retry_utils.c index 7063fa203..9fa8f0442 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/retry_utils/retry_utils_freertos.c +++ b/FreeRTOS-Plus/Source/Application-Protocols/platform/retry_utils/retry_utils.c @@ -20,7 +20,7 @@ */ /** - * @file retry_utils_freertos.c + * @file retry_utils.c * @brief Utility implementation of backoff logic, used for attempting retries of failed processes. */ diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/include/retry_utils.h b/FreeRTOS-Plus/Source/Application-Protocols/platform/retry_utils/retry_utils.h similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/include/retry_utils.h rename to FreeRTOS-Plus/Source/Application-Protocols/platform/retry_utils/retry_utils.h diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/freertos_sockets_wrapper.c b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.c similarity index 98% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/freertos_sockets_wrapper.c rename to FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.c index f433b3efd..fa2d21125 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/freertos_sockets_wrapper.c +++ b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.c @@ -20,7 +20,7 @@ */ /** - * @file freertos_sockets_wrapper.c + * @file freertos_plus_tcp_sockets_wrapper.c * @brief FreeRTOS Sockets connect and disconnect wrapper implementation. */ @@ -30,7 +30,7 @@ /* FreeRTOS includes. */ #include "FreeRTOS.h" -#include "freertos_sockets_wrapper.h" +#include "freertos_plus_tcp_sockets_wrapper.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/freertos_sockets_wrapper.h b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.h similarity index 98% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/freertos_sockets_wrapper.h rename to FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.h index 481662b7c..6d801a8a2 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/freertos_sockets_wrapper.h +++ b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.h @@ -20,7 +20,7 @@ */ /** - * @file freertos_sockets_wrapper.h + * @file freertos_plus_tcp_sockets_wrapper.h * @brief FreeRTOS Sockets connect and disconnect function wrapper. */ diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/plaintext_freertos.c b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/plaintext/freertos_plus_tcp_plaintext.c similarity index 98% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/plaintext_freertos.c rename to FreeRTOS-Plus/Source/Application-Protocols/platform/transport/plaintext/freertos_plus_tcp_plaintext.c index a6c6c30d6..323224088 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/plaintext_freertos.c +++ b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/plaintext/freertos_plus_tcp_plaintext.c @@ -30,10 +30,10 @@ #include "FreeRTOS_Sockets.h" /* FreeRTOS Socket wrapper include. */ -#include "freertos_sockets_wrapper.h" +#include "freertos_plus_tcp_sockets_wrapper.h" /* Transport interface include. */ -#include "plaintext_freertos.h" +#include "freertos_plus_tcp_plaintext.h" PlaintextTransportStatus_t Plaintext_FreeRTOS_Connect( NetworkContext_t * pNetworkContext, const char * pHostName, diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/plaintext_freertos.h b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/plaintext/include/freertos_plus_tcp_plaintext.h similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/plaintext_freertos.h rename to FreeRTOS-Plus/Source/Application-Protocols/platform/transport/plaintext/include/freertos_plus_tcp_plaintext.h diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/tls_freertos.c b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls.c similarity index 99% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/tls_freertos.c rename to FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls.c index fe688d26f..9b230a1f3 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/tls_freertos.c +++ b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls.c @@ -36,10 +36,10 @@ #include "FreeRTOS_Sockets.h" /* TLS transport header. */ -#include "tls_freertos.h" +#include "freertos_plus_tcp_mbedtls.h" /* FreeRTOS Socket wrapper include. */ -#include "freertos_sockets_wrapper.h" +#include "freertos_plus_tcp_sockets_wrapper.h" /* mbedTLS util includes. */ #include "mbedtls_error.h" diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/tls_freertos_pkcs11.c b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls_pkcs11.c similarity index 99% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/tls_freertos_pkcs11.c rename to FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls_pkcs11.c index cb3d37fce..87cf9e8ef 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/tls_freertos_pkcs11.c +++ b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls_pkcs11.c @@ -39,10 +39,10 @@ #include "FreeRTOS_Sockets.h" /* TLS transport header. */ -#include "tls_freertos_pkcs11.h" +#include "freertos_plus_tcp_mbedtls_pkcs11.h" /* FreeRTOS Socket wrapper include. */ -#include "freertos_sockets_wrapper.h" +#include "freertos_plus_tcp_sockets_wrapper.h" /* mbedTLS util includes. */ #include "mbedtls_error.h" diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/tls_freertos.h b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/include/freertos_plus_tcp_mbedtls.h similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/tls_freertos.h rename to FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/include/freertos_plus_tcp_mbedtls.h diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/tls_freertos_pkcs11.h b/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/include/freertos_plus_tcp_mbedtls_pkcs11.h similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/tls_freertos_pkcs11.h rename to FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/include/freertos_plus_tcp_mbedtls_pkcs11.h diff --git a/FreeRTOS-Plus/Source/coreJSON b/FreeRTOS-Plus/Source/coreJSON index bfbe32605..3fcea77f6 160000 --- a/FreeRTOS-Plus/Source/coreJSON +++ b/FreeRTOS-Plus/Source/coreJSON @@ -1 +1 @@ -Subproject commit bfbe3260590f0fafca549ba0034f5d17e97a1b4c +Subproject commit 3fcea77f6828be92fb3d3c7593b27105b6e809b4