From 37d791f787d243e6cca24bd3e6141c86201455bd Mon Sep 17 00:00:00 2001 From: Max Goedjen Date: Mon, 8 Sep 2025 00:16:10 -0700 Subject: [PATCH] Put back --- Sources/Packages/Package.swift | 10 ++++++++-- .../SecretAgentKit/SigningRequestTracer.swift | 10 +--------- .../Sources/SecretAgentKitHeaders/Stub.swift | 1 + .../include/SecretAgentKit.h | 19 +++++++++++++++++++ .../SecretAgentKitHeaders/module.modulemap | 4 ++++ 5 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 Sources/Packages/Sources/SecretAgentKitHeaders/Stub.swift create mode 100644 Sources/Packages/Sources/SecretAgentKitHeaders/include/SecretAgentKit.h create mode 100644 Sources/Packages/Sources/SecretAgentKitHeaders/module.modulemap diff --git a/Sources/Packages/Package.swift b/Sources/Packages/Package.swift index ba4af8b..dec30d6 100644 --- a/Sources/Packages/Package.swift +++ b/Sources/Packages/Package.swift @@ -22,6 +22,9 @@ let package = Package( .library( name: "SecretAgentKit", targets: ["SecretAgentKit", "XPCWrappers"]), + .library( + name: "SecretAgentKitHeaders", + targets: ["SecretAgentKitHeaders"]), .library( name: "Brief", targets: ["Brief"]), @@ -57,10 +60,13 @@ let package = Package( ), .target( name: "SecretAgentKit", - dependencies: ["SecretKit"], + dependencies: ["SecretKit", "SecretAgentKitHeaders"], resources: [localization], swiftSettings: swiftSettings, ), + .systemLibrary( + name: "SecretAgentKitHeaders", + ), .testTarget( name: "SecretAgentKitTests", dependencies: ["SecretAgentKit"], @@ -77,7 +83,7 @@ let package = Package( ), .target( name: "XPCWrappers", - swiftSettings: swiftSettings + [.treatWarning("DeprecatedDeclaration", as: .warning)], + swiftSettings: swiftSettings, ), ] ) diff --git a/Sources/Packages/Sources/SecretAgentKit/SigningRequestTracer.swift b/Sources/Packages/Sources/SecretAgentKit/SigningRequestTracer.swift index 96ced63..2872825 100644 --- a/Sources/Packages/Sources/SecretAgentKit/SigningRequestTracer.swift +++ b/Sources/Packages/Sources/SecretAgentKit/SigningRequestTracer.swift @@ -2,15 +2,7 @@ import Foundation import AppKit import Security import SecretKit -//import SecretAgentKitHeaders - -// from libproc.h -@_silgen_name("proc_pidpath") -@discardableResult func proc_pidpath(_ pid: Int32, _ buffer: UnsafeMutableRawPointer!, _ buffersize: UInt32) -> Int32 - -//// from SecTask.h -@_silgen_name("SecCodeCreateWithPID") -@discardableResult func SecCodeCreateWithPID(_: Int32, _: SecCSFlags, _: UnsafeMutablePointer?>!) -> OSStatus +import SecretAgentKitHeaders /// An object responsible for generating ``SecretKit.SigningRequestProvenance`` objects. struct SigningRequestTracer { diff --git a/Sources/Packages/Sources/SecretAgentKitHeaders/Stub.swift b/Sources/Packages/Sources/SecretAgentKitHeaders/Stub.swift new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Sources/Packages/Sources/SecretAgentKitHeaders/Stub.swift @@ -0,0 +1 @@ + diff --git a/Sources/Packages/Sources/SecretAgentKitHeaders/include/SecretAgentKit.h b/Sources/Packages/Sources/SecretAgentKitHeaders/include/SecretAgentKit.h new file mode 100644 index 0000000..e9c7150 --- /dev/null +++ b/Sources/Packages/Sources/SecretAgentKitHeaders/include/SecretAgentKit.h @@ -0,0 +1,19 @@ +#import +#import + + +// Forward declarations + +// from libproc.h +int proc_pidpath(int pid, void * buffer, uint32_t buffersize); + +// from SecTask.h +OSStatus SecCodeCreateWithPID(int32_t, SecCSFlags, SecCodeRef *); + +//! Project version number for SecretAgentKit. +FOUNDATION_EXPORT double SecretAgentKitVersionNumber; + +//! Project version string for SecretAgentKit. +FOUNDATION_EXPORT const unsigned char SecretAgentKitVersionString[]; + + diff --git a/Sources/Packages/Sources/SecretAgentKitHeaders/module.modulemap b/Sources/Packages/Sources/SecretAgentKitHeaders/module.modulemap new file mode 100644 index 0000000..7fceeab --- /dev/null +++ b/Sources/Packages/Sources/SecretAgentKitHeaders/module.modulemap @@ -0,0 +1,4 @@ +module SecretAgentKitHeaders [system] { + header "include/SecretAgentKit.h" + export * +}