use updated csdk init apis. be more careful with optionals

openziti · Oct 3, 2023 · 47c0bed · 47c0bed
1 parent eb1c3e8
commit 47c0bed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/deps/ziti-tunnel-sdk-c b/deps/ziti-tunnel-sdk-c
diff --git a/lib/Ziti.swift b/lib/Ziti.swift
@@ -425,8 +425,11 @@ import CZitiPrivate
         let privKeyPEMPtr = UnsafeMutablePointer<Int8>.allocate(capacity: privKeyPEM.count + 1)
         privKeyPEMPtr.initialize(from: privKeyPEM, count: privKeyPEM.count + 1)
 
-        let caPEMPtr = UnsafeMutablePointer<Int8>.allocate(capacity: id.ca!.count + 1)
-        caPEMPtr.initialize(from: id.ca!, count: id.ca!.count + 1)
+        var caPEMPtr:UnsafeMutablePointer<Int8>? = nil
+        if (id.ca != nil) {
+            caPEMPtr = UnsafeMutablePointer<Int8>.allocate(capacity: id.ca!.count + 1)
+            caPEMPtr!.initialize(from: id.ca!, count: id.ca!.count + 1)
+        }
 
         // set up the ziti_config with our cert, etc.
         var zitiCfg = ziti_config(
@@ -446,11 +449,11 @@ import CZitiPrivate
         ctrlPtr.deallocate()
         certPEMPtr.deallocate()
         privKeyPEMPtr.deallocate()
-        caPEMPtr.deallocate()
+        if (caPEMPtr != nil) {
+            caPEMPtr!.deallocate()
+        }
 
         zitiOpts = ziti_options(config: nil,
-                                controller: nil,
-                                tls: nil,
                                 disabled: id.startDisabled ?? false,
                                 config_types: ziti_all_configs,
                                 api_page_size: 25,
+1 −1		CMakeLists.txt
+1 −1		lib/ziti-tunnel-cbs/ziti_tunnel_ctrl.c