Add use_prov_client as a FEATURE

6 files changed, 32 insertions, 19 deletions

diff --git a/ports/azure-c-shared-utility/no-etw-check-cmake.patch b/ports/azure-c-shared-utility/no-etw-check-cmake.patch
new file mode 100644
index 000000000..bef3b35c4
--- /dev/null
+++ b/ports/azure-c-shared-utility/no-etw-check-cmake.patch
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index 3b95bd6dd..a8a5adc8e 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -6,19 +6,19 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF 1f3fd807c8c47b6607d349469301afb64643aa89
-        SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2
+        REF 6061b6bfb035524f27d1245d63bbd825519423a9
+        SHA512 0cf3aacc13d0752889c765272450702e348d4b17015618a25897f55a42a2b7208141dd3dca8b0bea14e7b4e4d6f8a8880ce734be61924c39a7ebc39341fa5d7f
         HEAD_REF master
-        PATCHES no-double-expand-cmake.patch
+        PATCHES no-double-expand-cmake.patch no-double-expand-cmake.patch
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF 1f3fd807c8c47b6607d349469301afb64643aa89
-        SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2
+        REF 6061b6bfb035524f27d1245d63bbd825519423a9
+        SHA512 0cf3aacc13d0752889c765272450702e348d4b17015618a25897f55a42a2b7208141dd3dca8b0bea14e7b4e4d6f8a8880ce734be61924c39a7ebc39341fa5d7f
         HEAD_REF master
-        PATCHES no-double-expand-cmake.patch
+        PATCHES no-double-expand-cmake.patch no-double-expand-cmake.patch
     )
 endif()
 
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
index 33349bef1..af84a4543 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -3,6 +3,9 @@ Version: 2019-08-20.1
 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 
 
-Feature: public-preview
+Feature: public-preview 
 Description: A version of the azure-iot-sdk-c containing public-preview features.
 Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview], azure-macro-utils-c, umock-c
+
+Feature: use_prov_client
+Description: Enables device provisioning client for DPS
\ No newline at end of file
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 318856a30..c4577cf4a 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -6,22 +6,30 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF 8b7cc18456f377b7f0df42dcdefb24ae81d9e7fc
-        SHA512 0386889fc3d32a795998a35a382cce6d11f6712416f3a1a49de6ea7d9c0c973ca05989353ee9a3ec5ca02dc55c2b59dc803cbf4866b918274667e52d03d1490f
-        HEAD_REF public-preview
+        REF b6b38ef7ca237ed526a24fafc15a9da5d8408f8a
+        SHA512 af014dcc0c623c03ba99bf25921833995ab041455a50b1e9b74fc39d956bb5b37fdcd246caaafa861195abd777fd9d5a15bf3f9209501bc5e65afd2671cd6cd4
+        HEAD_REF public-preview-cmake_skip_default_hsm_set 
         PATCHES improve-external-deps.patch
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF b03cc5e0afb647934e45d4530d3e993476db3d3e
-        SHA512 7428c625dbacfd9ab612d5bbfad3c079074cd3834fe84a42db88e747aab2615140c0ca3035adc36b29ed8cf4bf487360522215ce03cee3e26254af925a68384a
-        HEAD_REF master
+        REF 14fe013afb4953fb0ccc1bcedad947a619677c5d
+        SHA512 2f52c58c2a964d4d1c9fc5c5c7048ec64bc0a74a86855ce1a228f86838aa1634f3309850988474ba3b4444dda022dbc0cc6bd3ed00bde87d1539128905495b8f
+        HEAD_REF cmake_skip_default_hsm_set
         PATCHES improve-external-deps.patch
     )
 endif()
 
+if("use_prov_client" IN_LIST FEATURES)
+    message(STATUS "use prov_client")
+    set(USE_PROV_CLIENT 1)
+else()
+    message(STATUS "NO prov_client")
+    set(USE_PROV_CLIENT 0)
+endif()
+
 file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/)
 file(COPY ${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/cmake/azure_iot_sdks/)
 
@@ -34,6 +42,8 @@ vcpkg_configure_cmake(
         -Duse_default_uuid=ON
         -Dbuild_as_dynamic=OFF
         -Duse_edge_modules=ON
+        -Duse_prov_client=${USE_PROV_CLIENT}
+        -Dhsm_type_symm_key=${USE_PROV_CLIENT}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/azure-macro-utils-c/portfile.cmake b/ports/azure-macro-utils-c/portfile.cmake
index 6f4713e74..907ecaff8 100644
--- a/ports/azure-macro-utils-c/portfile.cmake
+++ b/ports/azure-macro-utils-c/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-macro-utils-c
-    REF 17a6ad1df91e57d6981366710096798bcb5991a6
-    SHA512 8f5b9561ff303832834113098a3c9eeace1f1fbbc55e508c50d0f75bfe08ee05b54a8d6a0786148c5e7861a0149317a2cc113022626f8ac72df732bda9162855
+    REF 7523af934fc4d9423111e358f49b19314ec9c3e3 
+    SHA512 b53765096654fff9c5670004e4e107bffa81dd07e63eeac687c9e2b7e5ea2e1f26b6ae025c05c45f5c28152a457922f08c7f8d3303fa4d3b9194c34ba59533d5
     HEAD_REF master
 )
 
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index 83bf227ab..4ddd96cf7 100644
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF 5764c24be5db7a7c5988a5f1d63c329f68f1c8d8
-        SHA512 c5a976b84a9efb0951ae60b3dc7bae9862c7eac633ced2cf252fc3133cb06f16c584f8dfd5ce74adeadc5c922742c8e8fa31813e00e80cd67c39fc1825002c64
+        REF 682bbfd043aadaafb3bfb349a7b807a220bfeaa0
+        SHA512 565bdcd89ae99bb199aec7c9de81851a7b409cd7fe50ad4f758913c192c5b941828f058e7ce3d38d3daaf9b98a178acd17143025096affa4b89aa40c3b5673bd
         HEAD_REF master
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF 5764c24be5db7a7c5988a5f1d63c329f68f1c8d8
-        SHA512 c5a976b84a9efb0951ae60b3dc7bae9862c7eac633ced2cf252fc3133cb06f16c584f8dfd5ce74adeadc5c922742c8e8fa31813e00e80cd67c39fc1825002c64
+        REF 682bbfd043aadaafb3bfb349a7b807a220bfeaa0
+        SHA512 565bdcd89ae99bb199aec7c9de81851a7b409cd7fe50ad4f758913c192c5b941828f058e7ce3d38d3daaf9b98a178acd17143025096affa4b89aa40c3b5673bd
         HEAD_REF master
     )
 endif()