update ziti-sdk@1.7.0/tlsuv/v0.36.0

ekoby · ekoby · commit 03b0a7757bbb · 2025-06-18T18:35:57.000-04:00
Windows: use native crypto (windows CNG)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.21)
 
 
 set(ZITI_SDK_DIR "" CACHE FILEPATH "developer option: use local ziti-sdk-c checkout")
-set(ZITI_SDK_VERSION "1.6.6" CACHE STRING "ziti-sdk-c version or branch to use")
+set(ZITI_SDK_VERSION "1.7.0" CACHE STRING "ziti-sdk-c version or branch to use")
 
 # if TUNNEL_SDK_ONLY then don't descend into programs/ziti-edge-tunnel
 option(TUNNEL_SDK_ONLY "build only ziti-tunnel-sdk (without ziti)" OFF)
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -150,8 +150,7 @@
       "binaryDir": "${sourceDir}/build",
       "hidden": true,
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "TLSUV_TLSLIB": "openssl"
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
       }
     },
     {
diff --git a/vcpkg.json b/vcpkg.json
@@ -12,6 +12,7 @@
     },
     {
       "name": "openssl",
+      "platform": "!windows & !mingw",
       "$comment": "on linux we use system installed OpenSSL, as determined by vcpkg-overlays/linux-syslibs)"
     },
     "json-c",

Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,7 @@`
`150`	`150`	`"binaryDir": "${sourceDir}/build",`
`151`	`151`	`"hidden": true,`
`152`	`152`	`"cacheVariables": {`
`153`		`- "CMAKE_BUILD_TYPE": "RelWithDebInfo",`
`154`		`- "TLSUV_TLSLIB": "openssl"`
	`153`	`+ "CMAKE_BUILD_TYPE": "RelWithDebInfo"`
`155`	`154`	`}`
`156`	`155`	`},`
`157`	`156`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"name": "openssl",`
	`15`	`+ "platform": "!windows & !mingw",`
`15`	`16`	`"$comment": "on linux we use system installed OpenSSL, as determined by vcpkg-overlays/linux-syslibs)"`
`16`	`17`	`},`
`17`	`18`	`"json-c",`