diff --git a/OpenVPNAdapter.xcodeproj/project.pbxproj b/OpenVPNAdapter.xcodeproj/project.pbxproj index cbd4df9..24d6e3c 100644 --- a/OpenVPNAdapter.xcodeproj/project.pbxproj +++ b/OpenVPNAdapter.xcodeproj/project.pbxproj @@ -7,7 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 7B777E2329E1C76C00718406 /* ck-ovpn-plugin-arm64.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B777E2229E1C75200718406 /* ck-ovpn-plugin-arm64.a */; platformFilter = ios; }; + 7BFD7A7D29E5B93E0066D7CC /* arm64.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFD7A7C29E5B9320066D7CC /* arm64.a */; }; + 7BFD7A7E29E5BCE30066D7CC /* arm64.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BFD7A7C29E5B9320066D7CC /* arm64.a */; }; + 7BFD7A8029E5BEF90066D7CC /* ovpncli.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_73 /* ovpncli.mm */; }; C910EAE524EBB1DA0081AF13 /* OpenVPNReachabilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97E5FD624123F48005C2EBC /* OpenVPNReachabilityTests.swift */; }; C910EAE724EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h in Headers */ = {isa = PBXBuildFile; fileRef = C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */; settings = {ATTRIBUTES = (Public, ); }; }; C910EAEE24EBBFB60081AF13 /* client.crt in Resources */ = {isa = PBXBuildFile; fileRef = C910EAEB24EBBFB60081AF13 /* client.crt */; }; @@ -106,7 +108,6 @@ OBJ_301 /* OpenVPNSessionToken.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_69 /* OpenVPNSessionToken.h */; settings = {ATTRIBUTES = (Public, ); }; }; OBJ_302 /* OpenVPNCertificate.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_70 /* OpenVPNCertificate.h */; settings = {ATTRIBUTES = (Public, ); }; }; OBJ_304 /* OpenVPNClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::OpenVPNClient::Product" /* OpenVPNClient.framework */; }; - OBJ_322 /* ovpncli.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_73 /* ovpncli.mm */; }; OBJ_324 /* mbedTLS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::mbedTLS::Product" /* mbedTLS.framework */; }; OBJ_325 /* LZ4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::LZ4::Product" /* LZ4.framework */; }; OBJ_332 /* aes.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_85 /* aes.c */; }; @@ -231,6 +232,8 @@ /* Begin PBXFileReference section */ 7B777E2229E1C75200718406 /* ck-ovpn-plugin-arm64.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "ck-ovpn-plugin-arm64.a"; sourceTree = ""; }; 7B7795A329DC896200D15D50 /* ck-ovpn-plugin.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "ck-ovpn-plugin.a"; sourceTree = ""; }; + 7BFD7A7A29E475F80066D7CC /* ck-ovpn-plugin-arm64s.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "ck-ovpn-plugin-arm64s.a"; sourceTree = ""; }; + 7BFD7A7C29E5B9320066D7CC /* arm64.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = arm64.a; sourceTree = ""; }; C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = OpenVPNConfigurationEvaluation.h; sourceTree = ""; }; C910EAEB24EBBFB60081AF13 /* client.crt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = client.crt; sourceTree = ""; }; C910EAEC24EBBFB60081AF13 /* ca.crt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ca.crt; sourceTree = ""; }; @@ -510,9 +513,9 @@ buildActionMask = 0; files = ( OBJ_304 /* OpenVPNClient.framework in Frameworks */, + 7BFD7A7D29E5B93E0066D7CC /* arm64.a in Frameworks */, C9EABF3124110BE200D828D4 /* SystemConfiguration.framework in Frameworks */, C97E5FEC24124B73005C2EBC /* mbedTLS.framework in Frameworks */, - 7B777E2329E1C76C00718406 /* ck-ovpn-plugin-arm64.a in Frameworks */, C97E5FE724124B6F005C2EBC /* LZ4.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -521,6 +524,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 0; files = ( + 7BFD7A7E29E5BCE30066D7CC /* arm64.a in Frameworks */, OBJ_324 /* mbedTLS.framework in Frameworks */, OBJ_325 /* LZ4.framework in Frameworks */, ); @@ -564,6 +568,8 @@ C9EABF2F24110BE100D828D4 /* Frameworks */ = { isa = PBXGroup; children = ( + 7BFD7A7C29E5B9320066D7CC /* arm64.a */, + 7BFD7A7A29E475F80066D7CC /* ck-ovpn-plugin-arm64s.a */, 7B777E2229E1C75200718406 /* ck-ovpn-plugin-arm64.a */, 7B7795A329DC896200D15D50 /* ck-ovpn-plugin.a */, C9EABF642411189800D828D4 /* UIKit.framework */, @@ -1234,7 +1240,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 0; files = ( - OBJ_322 /* ovpncli.mm in Sources */, + 7BFD7A8029E5BEF90066D7CC /* ovpncli.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1560,7 +1566,9 @@ PRODUCT_BUNDLE_IDENTIFIER = OpenVPNAdapter; PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = OpenVPNAdapter; "VALID_ARCHS[sdk=iphoneos*]" = arm64; @@ -1594,7 +1602,9 @@ PRODUCT_BUNDLE_IDENTIFIER = OpenVPNAdapter; PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = OpenVPNAdapter; "VALID_ARCHS[sdk=iphoneos*]" = arm64; @@ -1631,8 +1641,10 @@ baseConfigurationReference = C9EABF7324111AEE00D828D4 /* OpenVPNClient.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + CODE_SIGN_IDENTITY = "Apple Development"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = NO; + DEVELOPMENT_TEAM = X7UJ388FXK; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1643,6 +1655,10 @@ "$(inherited)", "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); MACH_O_TYPE = staticlib; MARKETING_VERSION = 3.5.6; OTHER_CFLAGS = "$(inherited)"; @@ -1651,9 +1667,13 @@ PRODUCT_BUNDLE_IDENTIFIER = OpenVPNClient; PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = OpenVPNClient; + VALID_ARCHS = arm64; + a = ""; }; name = Debug; }; @@ -1662,8 +1682,10 @@ baseConfigurationReference = C9EABF7324111AEE00D828D4 /* OpenVPNClient.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + CODE_SIGN_IDENTITY = "Apple Development"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = NO; + DEVELOPMENT_TEAM = X7UJ388FXK; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1674,6 +1696,10 @@ "$(inherited)", "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); MACH_O_TYPE = staticlib; MARKETING_VERSION = 3.5.6; OTHER_CFLAGS = "$(inherited)"; @@ -1682,9 +1708,13 @@ PRODUCT_BUNDLE_IDENTIFIER = OpenVPNClient; PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = OpenVPNClient; + VALID_ARCHS = arm64; + a = ""; }; name = Release; }; @@ -1693,8 +1723,10 @@ baseConfigurationReference = C9EABF7624111F1600D828D4 /* mbedTLS.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + CODE_SIGN_IDENTITY = "Apple Development"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = NO; + DEVELOPMENT_TEAM = X7UJ388FXK; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1722,8 +1754,10 @@ baseConfigurationReference = C9EABF7624111F1600D828D4 /* mbedTLS.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + CODE_SIGN_IDENTITY = "Apple Development"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = NO; + DEVELOPMENT_TEAM = X7UJ388FXK; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/OpenVPNAdapter.xcodeproj/xcshareddata/xcschemes/OpenVPNAdapter.xcscheme b/OpenVPNAdapter.xcodeproj/xcshareddata/xcschemes/OpenVPNAdapter.xcscheme index 88b453f..b40b132 100644 --- a/OpenVPNAdapter.xcodeproj/xcshareddata/xcschemes/OpenVPNAdapter.xcscheme +++ b/OpenVPNAdapter.xcodeproj/xcshareddata/xcschemes/OpenVPNAdapter.xcscheme @@ -50,7 +50,7 @@ @@ -62,6 +62,20 @@ ReferencedContainer = "container:OpenVPNAdapter.xcodeproj"> + + + + - - - - - - - - /* for ptrdiff_t below */ +#include #ifndef GO_CGO_EXPORT_PROLOGUE_H #define GO_CGO_EXPORT_PROLOGUE_H @@ -19,12 +19,6 @@ typedef struct { const char *p; ptrdiff_t n; } _GoString_; /* Start of preamble from import "C" comments. */ -#line 11 "ck-ovpn-plugin.go" - -#include -#include - -#line 1 "cgo-generated-wrapper" /* End of preamble from import "C" comments. */ @@ -44,19 +38,25 @@ typedef int GoInt32; typedef unsigned int GoUint32; typedef long long GoInt64; typedef unsigned long long GoUint64; -typedef GoInt32 GoInt; -typedef GoUint32 GoUint; -typedef __SIZE_TYPE__ GoUintptr; +typedef GoInt64 GoInt; +typedef GoUint64 GoUint; +typedef size_t GoUintptr; typedef float GoFloat32; typedef double GoFloat64; +#ifdef _MSC_VER +#include +typedef _Fcomplex GoComplex64; +typedef _Dcomplex GoComplex128; +#else typedef float _Complex GoComplex64; typedef double _Complex GoComplex128; +#endif /* static assertion to make sure the file is being used on architecture at least with matching size of GoInt. */ -//typedef char _check_for_32_bit_pointer_matching_GoInt[sizeof(void*)==32/8 ? 1:-1]; +// typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1]; #ifndef GO_CGO_GOSTRING_TYPEDEF typedef _GoString_ GoString; diff --git a/arm64.a b/arm64.a new file mode 100644 index 0000000..4882e6b Binary files /dev/null and b/arm64.a differ diff --git a/ck-ovpn-plugin-arm64s.a b/ck-ovpn-plugin-arm64s.a new file mode 100755 index 0000000..78ab3b0 Binary files /dev/null and b/ck-ovpn-plugin-arm64s.a differ