Skip to content

Commit a0c24b6

Browse files
smilindave26smilindave26
authored
Merge pull request #321 from openziti/enroll-to-cert
Enroll to cert
2 parents 85e692d + d7e8bfe commit a0c24b6

File tree

13 files changed

+948
-148
lines changed

13 files changed

+948
-148
lines changed

‎CZiti.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@
215215
5AA298BB2585961C001F7502 /* NetifDriver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetifDriver.swift; sourceTree = "<group>"; };
216216
5AAAEDE32464D8AB00C56383 /* ziti-mac-enroller */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "ziti-mac-enroller"; sourceTree = BUILT_PRODUCTS_DIR; };
217217
5AAAEDE52464D8AB00C56383 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
218+
5AAAEDF02464D8AB00C56383 /* ziti-mac-enroller.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "ziti-mac-enroller.entitlements"; sourceTree = "<group>"; };
218219
5AB6DF68244B7C3C00F4B4E0 /* libCZiti.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCZiti.a; sourceTree = BUILT_PRODUCTS_DIR; };
219220
5AB6DF78244B8F2000F4B4E0 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "deps/ziti-tunnel-sdk-c/build-os-arch/vcpkg_installed/os-arch/lib/libssl.a"; sourceTree = "<group>"; };
220221
5AB6DF79244B8F2000F4B4E0 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "deps/ziti-tunnel-sdk-c/build-os-arch/vcpkg_installed/os-arch/lib/libcrypto.a"; sourceTree = "<group>"; };
@@ -414,6 +415,7 @@
414415
5AAAEDE42464D8AB00C56383 /* ziti-mac-enroller */ = {
415416
isa = PBXGroup;
416417
children = (
418+
5AAAEDF02464D8AB00C56383 /* ziti-mac-enroller.entitlements */,
417419
5AAAEDE52464D8AB00C56383 /* main.swift */,
418420
);
419421
path = "ziti-mac-enroller";
@@ -877,6 +879,7 @@
877879
/* Begin XCBuildConfiguration section */
878880
5A0AC9452477424A0021E8D9 /* Debug */ = {
879881
isa = XCBuildConfiguration;
882+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
880883
buildSettings = {
881884
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
882885
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -954,6 +957,7 @@
954957
};
955958
5A0AC9462477424A0021E8D9 /* Release */ = {
956959
isa = XCBuildConfiguration;
960+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
957961
buildSettings = {
958962
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
959963
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -1142,6 +1146,7 @@
11421146
};
11431147
5AAAEDE82464D8AB00C56383 /* Debug */ = {
11441148
isa = XCBuildConfiguration;
1149+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
11451150
buildSettings = {
11461151
ALWAYS_SEARCH_USER_PATHS = NO;
11471152
CLANG_ANALYZER_NONNULL = YES;
@@ -1172,7 +1177,6 @@
11721177
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
11731178
CLANG_WARN_UNREACHABLE_CODE = YES;
11741179
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1175-
CODE_SIGN_IDENTITY = "-";
11761180
CODE_SIGN_STYLE = Automatic;
11771181
COPY_PHASE_STRIP = NO;
11781182
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1209,6 +1213,7 @@
12091213
};
12101214
5AAAEDE92464D8AB00C56383 /* Release */ = {
12111215
isa = XCBuildConfiguration;
1216+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
12121217
buildSettings = {
12131218
ALWAYS_SEARCH_USER_PATHS = NO;
12141219
CLANG_ANALYZER_NONNULL = YES;
@@ -1239,7 +1244,6 @@
12391244
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
12401245
CLANG_WARN_UNREACHABLE_CODE = YES;
12411246
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1242-
CODE_SIGN_IDENTITY = "-";
12431247
CODE_SIGN_STYLE = Automatic;
12441248
COPY_PHASE_STRIP = NO;
12451249
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -1269,6 +1273,7 @@
12691273
};
12701274
5AB6DF6F244B7C3C00F4B4E0 /* Debug */ = {
12711275
isa = XCBuildConfiguration;
1276+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
12721277
buildSettings = {
12731278
ALWAYS_SEARCH_USER_PATHS = NO;
12741279
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
@@ -1337,6 +1342,7 @@
13371342
};
13381343
5AB6DF70244B7C3C00F4B4E0 /* Release */ = {
13391344
isa = XCBuildConfiguration;
1345+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
13401346
buildSettings = {
13411347
ALWAYS_SEARCH_USER_PATHS = NO;
13421348
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
@@ -1398,6 +1404,7 @@
13981404
};
13991405
5AB6DFB4244B990A00F4B4E0 /* Debug */ = {
14001406
isa = XCBuildConfiguration;
1407+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
14011408
buildSettings = {
14021409
ALWAYS_SEARCH_USER_PATHS = NO;
14031410
CLANG_ANALYZER_NONNULL = YES;
@@ -1472,6 +1479,7 @@
14721479
};
14731480
5AB6DFB5244B990A00F4B4E0 /* Release */ = {
14741481
isa = XCBuildConfiguration;
1482+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
14751483
buildSettings = {
14761484
ALWAYS_SEARCH_USER_PATHS = NO;
14771485
CLANG_ANALYZER_NONNULL = YES;
@@ -1540,6 +1548,7 @@
15401548
};
15411549
5AB830CF247489C70089AF93 /* Debug */ = {
15421550
isa = XCBuildConfiguration;
1551+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
15431552
buildSettings = {
15441553
ALWAYS_SEARCH_USER_PATHS = NO;
15451554
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -1612,6 +1621,7 @@
16121621
};
16131622
5AB830D0247489C70089AF93 /* Release */ = {
16141623
isa = XCBuildConfiguration;
1624+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
16151625
buildSettings = {
16161626
ALWAYS_SEARCH_USER_PATHS = NO;
16171627
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -1678,6 +1688,7 @@
16781688
};
16791689
5AE14C892471D32E00179365 /* Debug */ = {
16801690
isa = XCBuildConfiguration;
1691+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
16811692
buildSettings = {
16821693
ALWAYS_SEARCH_USER_PATHS = NO;
16831694
CLANG_ANALYZER_NONNULL = YES;
@@ -1708,7 +1719,6 @@
17081719
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
17091720
CLANG_WARN_UNREACHABLE_CODE = YES;
17101721
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1711-
CODE_SIGN_IDENTITY = "-";
17121722
CODE_SIGN_STYLE = Automatic;
17131723
COPY_PHASE_STRIP = NO;
17141724
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1745,6 +1755,7 @@
17451755
};
17461756
5AE14C8A2471D32E00179365 /* Release */ = {
17471757
isa = XCBuildConfiguration;
1758+
baseConfigurationReference = 5A298539283C271E0056C9A7 /* workspace-settings.xcconfig */;
17481759
buildSettings = {
17491760
ALWAYS_SEARCH_USER_PATHS = NO;
17501761
CLANG_ANALYZER_NONNULL = YES;
@@ -1775,7 +1786,6 @@
17751786
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
17761787
CLANG_WARN_UNREACHABLE_CODE = YES;
17771788
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1778-
CODE_SIGN_IDENTITY = "-";
17791789
CODE_SIGN_STYLE = Automatic;
17801790
COPY_PHASE_STRIP = NO;
17811791
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";

‎CZiti.xcodeproj/xcshareddata/xcschemes/ziti-mac-enroller.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</BuildableProductRunnable>
5353
<CommandLineArguments>
5454
<CommandLineArgument
55-
argument = "/Users/dhart/Downloads/dave000.jwt"
55+
argument = "--url https://localhost:1280 /tmp/test-enroll.zid"
5656
isEnabled = "YES">
5757
</CommandLineArgument>
5858
</CommandLineArguments>

‎Configs/workspace-settings.xcconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ VCPKG_OS[sdk=iphoneos*] = ios
99
VCPKG_OS[sdk=iphonesimulator*] = iphonesimulator
1010
VCPKG_OS[sdk=macosx*] = osx
1111

12+
// Prevent macOS SDK netinet/ip6.h from conflicting with lwip's struct ip6_hdr
13+
// during Swift module compilation (Xcode 26+)
14+
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) _NETINET_IP6_H_=1
15+
1216
#include? "workspace-settings-overrides.xcconfig"

‎deps/ziti-tunnel-sdk-c‎

Submodule ziti-tunnel-sdk-c updated 52 files

0 commit comments

Comments
 (0)