diff --git a/StikDebug.xcodeproj/project.pbxproj b/StikDebug.xcodeproj/project.pbxproj index 7e144891..288d9dc4 100644 --- a/StikDebug.xcodeproj/project.pbxproj +++ b/StikDebug.xcodeproj/project.pbxproj @@ -8,7 +8,8 @@ /* Begin PBXBuildFile section */ 17C744F02E20BED000834F17 /* Pipify in Frameworks */ = {isa = PBXBuildFile; productRef = 17C744EF2E20BED000834F17 /* Pipify */; }; - 6874D2722E6B4A5E00B18184 /* ZSignApple in Frameworks */ = {isa = PBXBuildFile; productRef = 6874D2712E6B4A5E00B18184 /* ZSignApple */; }; + 68AD80462E6B65DA00DE9112 /* ZsignSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 68AD80452E6B65DA00DE9112 /* ZsignSwift */; }; + 68AD80482E6B65DA00DE9112 /* zsign in Frameworks */ = {isa = PBXBuildFile; productRef = 68AD80472E6B65DA00DE9112 /* zsign */; }; 68D569BE2E1B415700A5BA36 /* CodeEditorView in Frameworks */ = {isa = PBXBuildFile; productRef = 68D569BD2E1B415700A5BA36 /* CodeEditorView */; }; 68D569C02E1B415700A5BA36 /* LanguageSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 68D569BF2E1B415700A5BA36 /* LanguageSupport */; }; 68E714E62E6AA2B00025610F /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 68E714E52E6AA2B00025610F /* ZIPFoundation */; }; @@ -155,10 +156,11 @@ files = ( DCBA85862E3897BD00E88C06 /* StikImporter in Frameworks */, 17C744F02E20BED000834F17 /* Pipify in Frameworks */, + 68AD80462E6B65DA00DE9112 /* ZsignSwift in Frameworks */, + 68AD80482E6B65DA00DE9112 /* zsign in Frameworks */, 68D569C02E1B415700A5BA36 /* LanguageSupport in Frameworks */, 68D569BE2E1B415700A5BA36 /* CodeEditorView in Frameworks */, 68E714E62E6AA2B00025610F /* ZIPFoundation in Frameworks */, - 6874D2722E6B4A5E00B18184 /* ZSignApple in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -273,7 +275,8 @@ 17C744EF2E20BED000834F17 /* Pipify */, DCBA85852E3897BD00E88C06 /* StikImporter */, 68E714E52E6AA2B00025610F /* ZIPFoundation */, - 6874D2712E6B4A5E00B18184 /* ZSignApple */, + 68AD80452E6B65DA00DE9112 /* ZsignSwift */, + 68AD80472E6B65DA00DE9112 /* zsign */, ); productName = StikJIT; productReference = DC6F1D372D94EADD0071B2B6 /* StikDebug.app */; @@ -391,8 +394,8 @@ 68D569BC2E1B415700A5BA36 /* XCRemoteSwiftPackageReference "CodeEditorView" */, 17C744EE2E20BED000834F17 /* XCRemoteSwiftPackageReference "swiftui-pipify" */, DCBA85842E3897BD00E88C06 /* XCRemoteSwiftPackageReference "StikImporter" */, - 68CB05252E6AA15F0075BAA9 /* XCRemoteSwiftPackageReference "zsign-ios" */, 68E714E42E6AA2B00025610F /* XCRemoteSwiftPackageReference "ZIPFoundation" */, + 68AD80442E6B65DA00DE9112 /* XCRemoteSwiftPackageReference "Zsign-Package" */, ); preferredProjectObjectVersion = 77; productRefGroup = DC6F1D382D94EADD0071B2B6 /* Products */; @@ -1003,11 +1006,11 @@ kind = branch; }; }; - 68CB05252E6AA15F0075BAA9 /* XCRemoteSwiftPackageReference "zsign-ios" */ = { + 68AD80442E6B65DA00DE9112 /* XCRemoteSwiftPackageReference "Zsign-Package" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/zwsn/zsign-ios"; + repositoryURL = "https://github.com/khcrysalis/Zsign-Package/"; requirement = { - branch = main; + branch = package; kind = branch; }; }; @@ -1043,9 +1046,15 @@ package = 17C744EE2E20BED000834F17 /* XCRemoteSwiftPackageReference "swiftui-pipify" */; productName = Pipify; }; - 6874D2712E6B4A5E00B18184 /* ZSignApple */ = { + 68AD80452E6B65DA00DE9112 /* ZsignSwift */ = { + isa = XCSwiftPackageProductDependency; + package = 68AD80442E6B65DA00DE9112 /* XCRemoteSwiftPackageReference "Zsign-Package" */; + productName = ZsignSwift; + }; + 68AD80472E6B65DA00DE9112 /* zsign */ = { isa = XCSwiftPackageProductDependency; - productName = ZSignApple; + package = 68AD80442E6B65DA00DE9112 /* XCRemoteSwiftPackageReference "Zsign-Package" */; + productName = zsign; }; 68D569BD2E1B415700A5BA36 /* CodeEditorView */ = { isa = XCSwiftPackageProductDependency; diff --git a/StikDebug.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/StikDebug.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8ddaebc3..0bfa6604 100644 --- a/StikDebug.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/StikDebug.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "fd6a0b1431f87fb1abbacc56899d6160059dfd4b59e9d381af1131363e73fb23", + "originHash" : "01d0d47170e97de76701ab09eade5c2be88cf1d0ab755275f6cb2c56fe6d123c", "pins" : [ { "identity" : "codeeditorview", @@ -10,6 +10,15 @@ "version" : "0.15.4" } }, + { + "identity" : "openssl", + "kind" : "remoteSourceControl", + "location" : "https://github.com/krzyzanowskim/OpenSSL", + "state" : { + "revision" : "623c84da314e85363236507ca38a4bde65df21c3", + "version" : "3.3.3001" + } + }, { "identity" : "rearrange", "kind" : "remoteSourceControl", @@ -47,12 +56,12 @@ } }, { - "identity" : "zsign-ios", + "identity" : "zsign-package", "kind" : "remoteSourceControl", - "location" : "https://github.com/zwsn/zsign-ios", + "location" : "https://github.com/khcrysalis/Zsign-Package/", "state" : { - "branch" : "main", - "revision" : "a7f275fb4830ea48adf536fcddee7d05471970d0" + "branch" : "package", + "revision" : "6ffe703df73ef9069adacdbb19d571f11a69a801" } } ], diff --git a/StikJIT/Views/Testing.swift b/StikJIT/Views/Testing.swift index 44cf5583..04200c42 100644 --- a/StikJIT/Views/Testing.swift +++ b/StikJIT/Views/Testing.swift @@ -364,16 +364,6 @@ final class AppSignerManager: ObservableObject { try? FileManager.default.copyItem(at: icon1024URL, to: previewDest) } - let pw = KeychainHelper.shared.readPassword(forKey: cert.id.uuidString) ?? "" - let rc = zsign(appFolder.path, - cert.p12URL.path, - cert.p12URL.path, - cert.mobURL?.path ?? "", - pw, "", "") - guard rc == 0 else { - throw NSError(domain: "zsign", code: Int(rc), - userInfo: [NSLocalizedDescriptionKey: "zsign returned \(rc)"]) - } let outDir = docs.appendingPathComponent("SignedApps/\(newName)", isDirectory: true) if FileManager.default.fileExists(atPath: outDir.path) { try FileManager.default.removeItem(at: outDir) }