Merge branch 'main' into add-sanitizer-ci-job

aws · Dec 2, 2024 · b51f7f4 · b51f7f4
2 parents f8fa05b + 8a0a23e
commit b51f7f4
Show file tree

Hide file tree

Showing 54 changed files with 85 additions and 81 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(AwsGetVersion)

diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ __Jump To:__
 * [Supported Architectures](#supported-architectures)
 * [Installation](#installation)
 * [Samples](./samples)
+* [Mac-Only TLS Behavior](#mac-only-tls-behavior)
 * [Getting Help](#getting-help)
 * [FAQ](./documents/FAQ.md)
 * [API Docs](https://aws.github.io/aws-iot-device-sdk-cpp-v2/)
@@ -42,7 +43,7 @@ __Jump To:__
 ### Minimum Requirements
 * C++ 11 or higher
     * Clang 3.9+ or GCC 4.8+ or MSVC 2015+
-* CMake 3.1+
+* CMake 3.9+
 
 [Step-by-step instructions](./documents/PREREQUISITES.md)
 
@@ -108,6 +109,14 @@ existing `libcrypto`, instead of building its own copy.
 
 [Samples README](./samples)
 
+### Mac-Only TLS Behavior
+
+Please note that on Mac, once a private key is used with a certificate, that certificate-key pair is imported into the Mac Keychain.  All subsequent uses of that certificate will use the stored private key and ignore anything passed in programmatically.  Beginning in v1.7.3, when a stored private key from the Keychain is used, the following will be logged at the "info" log level:
+
+```
+static: certificate has an existing certificate-key pair that was previously imported into the Keychain.  Using key from Keychain instead of the one provided.
+```
+
 ## Getting Help
 
 The best way to interact with our team is through GitHub. You can open a [discussion](https://github.com/aws/aws-iot-device-sdk-cpp-v2/discussions) for guidance questions or an [issue](https://github.com/aws/aws-iot-device-sdk-cpp-v2/issues/new/choose) for bug reports, or feature requests. You may also find help on community resources such as [StackOverFlow](https://stackoverflow.com/questions/tagged/aws-iot) with the tag [#aws-iot](https://stackoverflow.com/questions/tagged/aws-iot) or if you have a support plan with [AWS Support](https://aws.amazon.com/premiumsupport/), you can also create a new support case.

diff --git a/crt/aws-c-iot b/crt/aws-c-iot
diff --git a/crt/aws-crt-cpp b/crt/aws-crt-cpp
diff --git a/deviceadvisor/tests/mqtt_connect/CMakeLists.txt b/deviceadvisor/tests/mqtt_connect/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt_connect CXX)
 

diff --git a/deviceadvisor/tests/mqtt_publish/CMakeLists.txt b/deviceadvisor/tests/mqtt_publish/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt_publish CXX)
 

diff --git a/deviceadvisor/tests/mqtt_subscribe/CMakeLists.txt b/deviceadvisor/tests/mqtt_subscribe/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt_subscribe CXX)
 

diff --git a/deviceadvisor/tests/shadow_update/CMakeLists.txt b/deviceadvisor/tests/shadow_update/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(shadow_update CXX)
 

diff --git a/devicedefender/CMakeLists.txt b/devicedefender/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 project(IotDeviceDefender-cpp
         LANGUAGES CXX)

diff --git a/discovery/CMakeLists.txt b/discovery/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 project(Discovery-cpp LANGUAGES CXX)
 if (DEFINED SIMPLE_VERSION)

diff --git a/documents/FAQ.md b/documents/FAQ.md
@@ -8,7 +8,6 @@
 * [Detecting connection loss (tldr use keepAliveTimeSecs and pingTimeoutMs)](#connection-loss)
 * [How to use a Pre-Built aws-crt-cpp (Most useful for development of this package)](#prebuilt-aws-crt-cpp)
 * [I am experiencing deadlocks](#i-am-experiencing-deadlocks)
-* [Mac-Only TLS Behavior](#mac-only-tls-behavior)
 * [How do debug in VSCode?](#how-do-debug-in-vscode)
 * [What certificates do I need?](#what-certificates-do-i-need)
 * [I still have more questions about this sdk?](#i-still-have-more-questions-about-this-sdk)
@@ -82,14 +81,6 @@ cmake --build . --target install
 
 You MUST NOT perform blocking operations on any callback, or you will cause a deadlock. For example: in the on_publish_received callback, do not send a publish, and then wait for the future to complete within the callback. The Client cannot do work until your callback returns, so the thread will be stuck.
 
-### Mac-Only TLS Behavior
-
-Please note that on Mac, once a private key is used with a certificate, that certificate-key pair is imported into the Mac Keychain.  All subsequent uses of that certificate will use the stored private key and ignore anything passed in programmatically.  Beginning in v1.7.3, when a stored private key from the Keychain is used, the following will be logged at the "info" log level:
-
-```
-static: certificate has an existing certificate-key pair that was previously imported into the Keychain.  Using key from Keychain instead of the one provided.
-```
-
 ### How do debug in VSCode?
 
 Here is an example launch.json file to run the pubsub sample

diff --git a/eventstream_rpc/CMakeLists.txt b/eventstream_rpc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 project(EventstreamRpc-cpp LANGUAGES CXX)
 if (DEFINED SIMPLE_VERSION)

diff --git a/greengrass_ipc/CMakeLists.txt b/greengrass_ipc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 project(GreengrassIpc-cpp LANGUAGES CXX)
 if (DEFINED SIMPLE_VERSION)

diff --git a/identity/CMakeLists.txt b/identity/CMakeLists.txt
@@ -1,6 +1,6 @@
 # This file is generated
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 project(IotIdentity-cpp LANGUAGES CXX)
 if (DEFINED SIMPLE_VERSION)

diff --git a/iotdevicecommon/CMakeLists.txt b/iotdevicecommon/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 project(IotDeviceCommon-cpp LANGUAGES CXX)
 if (DEFINED SIMPLE_VERSION)

diff --git a/jobs/CMakeLists.txt b/jobs/CMakeLists.txt
@@ -1,6 +1,6 @@
 # This file is generated
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 project(IotJobs-cpp LANGUAGES CXX)
 if (DEFINED SIMPLE_VERSION)

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 project(aws-iot-device-sdk-cpp-v2-samples)
 

diff --git a/samples/device_defender/basic_report/CMakeLists.txt b/samples/device_defender/basic_report/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(basic-report CXX)

diff --git a/samples/device_defender/mqtt5_basic_report/CMakeLists.txt b/samples/device_defender/mqtt5_basic_report/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt5-basic-report CXX)

diff --git a/samples/device_defender/mqtt5_basic_report/main.cpp b/samples/device_defender/mqtt5_basic_report/main.cpp
@@ -73,8 +73,19 @@ int main(int argc, char *argv[])
     Utils::cmdData cmdData = Utils::parseSampleInputDeviceDefender(argc, argv, &apiHandle);
 
     // Create the MQTT builder and populate it with data from cmdData.
-    auto clientConfigBuilder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
-        cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str());
+    auto clientConfigBuilder = std::unique_ptr<Aws::Iot::Mqtt5ClientBuilder>(
+        Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
+            cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str()));
+    if (clientConfigBuilder == nullptr)
+    {
+        fprintf(
+            stdout,
+            "Failed to setup MQTT5 client builder with error code %d: %s",
+            LastError(),
+            ErrorDebugString(LastError()));
+        return -1;
+    }
+
     if (cmdData.input_ca != "")
     {
         clientConfigBuilder->WithCertificateAuthority(cmdData.input_ca.c_str());
@@ -119,9 +130,6 @@ int main(int argc, char *argv[])
     // Create Mqtt5Client
     std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> client = clientConfigBuilder->Build();
 
-    // Clean up the builder
-    delete clientConfigBuilder;
-
     if (client == nullptr)
     {
         fprintf(

diff --git a/samples/fleet_provisioning/fleet_provisioning/CMakeLists.txt b/samples/fleet_provisioning/fleet_provisioning/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(fleet-provisioning CXX)
 

diff --git a/samples/fleet_provisioning/mqtt5_fleet_provisioning/CMakeLists.txt b/samples/fleet_provisioning/mqtt5_fleet_provisioning/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt5-fleet-provisioning CXX)
 

diff --git a/samples/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp b/samples/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp
@@ -82,8 +82,9 @@ struct RegisterThingContext
 std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> createMqtt5Client(const Utils::cmdData &cmdData, Mqtt5ClientContext &ctx)
 {
     // Create the MQTT5 builder and populate it with data from cmdData.
-    Aws::Iot::Mqtt5ClientBuilder *builder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
-        cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str());
+    auto builder = std::unique_ptr<Aws::Iot::Mqtt5ClientBuilder>(
+        Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
+            cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str()));
 
     // Check if the builder setup correctly.
     if (builder == nullptr)
@@ -128,7 +129,6 @@ std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> createMqtt5Client(const Utils::cmd
 
     // Create Mqtt5Client
     std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> client = builder->Build();
-    delete builder;
 
     return client;
 }

diff --git a/samples/greengrass/basic_discovery/CMakeLists.txt b/samples/greengrass/basic_discovery/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(basic-discovery CXX)
 

diff --git a/samples/greengrass/ipc/CMakeLists.txt b/samples/greengrass/ipc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(greengrass-ipc CXX)
 

diff --git a/samples/jobs/job_execution/CMakeLists.txt b/samples/jobs/job_execution/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(job-execution CXX)
 

diff --git a/samples/jobs/mqtt5_job_execution/CMakeLists.txt b/samples/jobs/mqtt5_job_execution/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt5-job-execution CXX)
 

diff --git a/samples/jobs/mqtt5_job_execution/main.cpp b/samples/jobs/mqtt5_job_execution/main.cpp
@@ -57,8 +57,9 @@ int main(int argc, char *argv[])
     Utils::cmdData cmdData = Utils::parseSampleInputJobs(argc, argv, &apiHandle);
 
     // Create the MQTT5 builder and populate it with data from cmdData.
-    Aws::Iot::Mqtt5ClientBuilder *builder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
-        cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str());
+    auto builder = std::unique_ptr<Aws::Iot::Mqtt5ClientBuilder>(
+        Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
+            cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str()));
 
     // Check if the builder setup correctly.
     if (builder == nullptr)
@@ -101,7 +102,6 @@ int main(int argc, char *argv[])
 
     // Create Mqtt5Client
     std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> client = builder->Build();
-    delete builder;
     /************************ Run the sample ****************************/
 
     fprintf(stdout, "Connecting...\n");

diff --git a/samples/mqtt/basic_connect/CMakeLists.txt b/samples/mqtt/basic_connect/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(basic-connect CXX)
 

diff --git a/samples/mqtt/cognito_connect/CMakeLists.txt b/samples/mqtt/cognito_connect/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(cognito-connect CXX)
 

diff --git a/samples/mqtt/custom_authorizer_connect/CMakeLists.txt b/samples/mqtt/custom_authorizer_connect/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(custom-authorizer-connect CXX)
 

diff --git a/samples/mqtt/pkcs11_connect/CMakeLists.txt b/samples/mqtt/pkcs11_connect/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(pkcs11-connect CXX)
 

diff --git a/samples/mqtt/pkcs12_connect/CMakeLists.txt b/samples/mqtt/pkcs12_connect/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(pkcs12-connect CXX)
 

diff --git a/samples/mqtt/websocket_connect/CMakeLists.txt b/samples/mqtt/websocket_connect/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(websocket-connect CXX)
 

diff --git a/samples/mqtt/windows_cert_connect/CMakeLists.txt b/samples/mqtt/windows_cert_connect/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(windows-cert-connect CXX)
 

diff --git a/samples/mqtt/x509_credentials_provider_connect/CMakeLists.txt b/samples/mqtt/x509_credentials_provider_connect/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(x509-credentials-provider-connect CXX)
 

diff --git a/samples/mqtt5/mqtt5_pubsub/CMakeLists.txt b/samples/mqtt5/mqtt5_pubsub/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt5_pubsub CXX)
 

diff --git a/samples/mqtt5/mqtt5_pubsub/main.cpp b/samples/mqtt5/mqtt5_pubsub/main.cpp
@@ -34,8 +34,9 @@ int main(int argc, char *argv[])
     Utils::cmdData cmdData = Utils::parseSampleInputPubSub(argc, argv, &apiHandle, "mqtt5-pubsub");
 
     // Create the MQTT5 builder and populate it with data from cmdData.
-    Aws::Iot::Mqtt5ClientBuilder *builder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
-        cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str());
+    auto builder = std::unique_ptr<Aws::Iot::Mqtt5ClientBuilder>(
+        Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
+            cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str()));
 
     // Check if the builder setup correctly.
     if (builder == nullptr)
@@ -107,9 +108,6 @@ int main(int argc, char *argv[])
     // Create Mqtt5Client
     std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> client = builder->Build();
 
-    // Clean up the builder
-    delete builder;
-
     if (client == nullptr)
     {
         fprintf(

diff --git a/samples/mqtt5/mqtt5_shared_subscription/CMakeLists.txt b/samples/mqtt5/mqtt5_shared_subscription/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt5_shared_subscription CXX)
 

diff --git a/samples/mqtt5/mqtt5_shared_subscription/main.cpp b/samples/mqtt5/mqtt5_shared_subscription/main.cpp
@@ -45,8 +45,9 @@ class sample_mqtt5_client
         std::shared_ptr<sample_mqtt5_client> result = std::make_shared<sample_mqtt5_client>();
         result->name = input_clientName;
 
-        Aws::Iot::Mqtt5ClientBuilder *builder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
-            input_endpoint, input_cert.c_str(), input_key.c_str());
+        auto builder = std::unique_ptr<Aws::Iot::Mqtt5ClientBuilder>(
+            Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
+                input_endpoint, input_cert.c_str(), input_key.c_str()));
         if (builder == nullptr)
         {
             return nullptr;
@@ -136,7 +137,6 @@ class sample_mqtt5_client
         });
 
         result->client = builder->Build();
-        delete builder;
         return result;
     }
 };

diff --git a/samples/pub_sub/basic_pub_sub/CMakeLists.txt b/samples/pub_sub/basic_pub_sub/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(basic-pub-sub CXX)
 

diff --git a/samples/pub_sub/cycle_pub_sub/CMakeLists.txt b/samples/pub_sub/cycle_pub_sub/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(cycle-pub-sub CXX)
 

diff --git a/samples/secure_tunneling/secure_tunnel/CMakeLists.txt b/samples/secure_tunneling/secure_tunnel/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(secure-tunnel CXX)
 

diff --git a/samples/secure_tunneling/tunnel_notification/CMakeLists.txt b/samples/secure_tunneling/tunnel_notification/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(tunnel-notification CXX)
 

diff --git a/samples/shadow/mqtt5_shadow_sync/CMakeLists.txt b/samples/shadow/mqtt5_shadow_sync/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt5-shadow-sync CXX)
+12 −3		.github/workflows/ci.yml
+4 −6		.github/workflows/clang-format.yml
+1 −5		CMakeLists.txt
+47 −0		format-check.py
+0 −24		format-check.sh
+1 −0		include/aws/iotdevice/iotdevice.h
+0 −4		include/aws/iotdevice/private/secure_tunneling_operations.h
+4 −1		source/iotdevice.c
+184 −223		source/secure_tunneling.c
+6 −28		source/secure_tunneling_operations.c
+57 −14		source/serializer.c
+8 −5		tests/secure_tunnel_tests.c
+8 −11		.github/workflows/ci.yml
+39 −18		CMakeLists.txt
+1 −1		VERSION
+1 −1		crt/aws-c-auth
+1 −1		crt/aws-c-cal
+1 −1		crt/aws-c-common
+1 −1		crt/aws-c-compression
+1 −1		crt/aws-c-event-stream
+1 −1		crt/aws-c-http
+1 −1		crt/aws-c-io
+1 −1		crt/aws-c-mqtt
+1 −1		crt/aws-c-s3
+1 −1		crt/aws-c-sdkutils
+1 −1		crt/aws-checksums
+1 −1		crt/aws-lc
+1 −1		crt/s2n
+2 −1		include/aws/crt/StringView.h
+1 −1		include/aws/crt/Variant.h
+39 −0		include/aws/crt/checksum/CRC.h
+1 −1		include/aws/crt/crypto/Hash.h
+7 −0		include/aws/crt/endpoints/RuleEngine.h
+24 −0		include/aws/crt/io/Stream.h
+9 −0		include/aws/iot/Mqtt5Client.h
+32 −0		source/checksum/CRC.cpp
+6 −0		source/endpoints/RuleEngine.cpp
+26 −0		source/io/Stream.cpp
+15 −0		source/iot/Mqtt5Client.cpp
+46 −0		tests/CRCTest.cpp
+18 −0		tests/RuleEngineTest.cpp