Dadoum/mainからプルリクエスト#97をマージする

Initial Linux support

Package.resolved

@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "swift-crypto",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-crypto.git",
+      "state" : {
+        "revision" : "bc1c29221f6dfeb0ebbfbc98eb95cd3d4967868e",
+        "version" : "3.4.0"
+      }
+    }
+  ],
+  "version" : 2
+}

Package.swift

@@ -4,6 +4,12 @@ import PackageDescription
 
 let package = Package(
     name: "MachOKit",
+    platforms: [
+        .macOS(.v10_15),
+        .iOS(.v13),
+        .watchOS(.v6),
+        .tvOS(.v13),
+    ],
     products: [
         .library(
             name: "MachOKit",
@@ -14,11 +20,15 @@ let package = Package(
             targets: ["MachOKitC"]
         )
     ],
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-crypto.git", "1.0.0" ..< "4.0.0")
+    ],
     targets: [
         .target(
             name: "MachOKit",
             dependencies: [
-                "MachOKitC"
+                "MachOKitC",
+                .product(name: "Crypto", package: "swift-crypto")
             ],
             swiftSettings: SwiftSetting.allCases
         ),

Sources/MachOKit/DyldCache.swift

@@ -50,10 +50,9 @@ public class DyldCache {
         )
 
         // check magic of header
-        guard let cpuType = header._cpuType,
-              let cpuSubType = header._cpuSubType else {
-            throw NSError() // FIXME: error
-        }
+        // FIXME: error instead of unwrap
+        let cpuType = header._cpuType!
+        let cpuSubType = header._cpuSubType!
         self.cpu = .init(
             typeRawValue: cpuType.rawValue,
             subtypeRawValue: cpuSubType.rawValue

Sources/MachOKit/Header/CPUSubType.swift

@@ -1054,6 +1054,7 @@ extension CPUARM64_32SubType: CustomStringConvertible {
 extension CPUSubType {
     /// CPU subtype of host pc
     static var current: CPUSubType? {
+#if canImport(Darwin)
         guard let cpuType: CPUType = .current else {
             return nil
         }
@@ -1062,6 +1063,9 @@ extension CPUSubType {
         let ret = sysctlbyname("hw.cpusubtype", &subtype, &size, nil, 0)
         guard ret != -1 else { return  nil }
         return .init(rawValue: subtype, of: cpuType)
+#else
+        return nil
+#endif        
     }
 }
 

Sources/MachOKit/Header/CPUType.swift

@@ -48,7 +48,7 @@ extension CPUType: RawRepresentable {
 
     public init?(rawValue: cpu_type_t) {
         switch rawValue {
-        case CPU_TYPE_ANY: self = .any
+        case RawValue(CPU_TYPE_ANY): self = .any
         case CPU_TYPE_VAX: self = .vax
         case CPU_TYPE_MC680x0: self = .mc680x0
         case CPU_TYPE_X86: self = .x86
@@ -71,7 +71,7 @@ extension CPUType: RawRepresentable {
 
     public var rawValue: cpu_type_t {
         switch self {
-        case .any: CPU_TYPE_ANY
+        case .any: RawValue(CPU_TYPE_ANY)
         case .vax: CPU_TYPE_VAX
         case .mc680x0: CPU_TYPE_MC680x0
         case .x86: CPU_TYPE_X86
@@ -127,6 +127,7 @@ extension CPUType {
 extension CPUType {
     /// CPU type of host pc
     static var current: CPUType? {
+#if canImport(Darwin)
         var type: cpu_type_t = 0
         var size = MemoryLayout<cpu_type_t>.size
         let ret = sysctlbyname("hw.cputype", &type, &size, nil, 0)
@@ -140,5 +141,8 @@ extension CPUType {
         }
 
         return .init(rawValue: type)
+#else
+        return nil
+#endif
     }
 }

Sources/MachOKit/Header/MachHeader/MachHeader.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import Darwin
 
 public struct MachHeader: LayoutWrapper {
     public var layout: mach_header

Sources/MachOKit/LoadCommand/BuildVersionCommand.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import MachO
 
 public struct BuildVersionCommand: LoadCommandWrapper {
     public typealias Layout = build_version_command

Sources/MachOKit/LoadCommand/EncryptionInfoCommand.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import MachO
 
 public protocol EncryptionInfoCommandProtocol: LoadCommandWrapper {
     var cryptId: Int { get }

Sources/MachOKit/LoadCommand/LoadCommand.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import MachO
 
 public enum LoadCommand {
     /// LC_SEGMENT

Sources/MachOKit/LoadCommand/LoadCommandType.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import MachO
 
 public enum LoadCommandType {
     /// LC_SEGMENT

Sources/MachOKit/LoadCommand/Model/Dylib.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import MachO
 
 public struct Dylib {
     /// library's path name

Sources/MachOKit/LoadCommand/RpathCommand.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import MachO
 
 public struct RpathCommand: LoadCommandWrapper {
     public typealias Layout = rpath_command

Sources/MachOKit/MachOFile+CodeSign.swift

@@ -6,6 +6,7 @@
 //
 //
 
+import CoreFoundation
 import Foundation
 import MachOKitC
 

Sources/MachOKit/MachOImage+CodeSign.swift

@@ -6,6 +6,7 @@
 //  
 //
 
+import CoreFoundation
 import Foundation
 
 extension MachOImage {

Sources/MachOKit/MachOImage+static.swift

@@ -7,11 +7,12 @@
 //
 
 import Foundation
-import MachO
+
 
 extension MachOImage {
     /// Sequence of loaded machO images.
     public static var images: AnySequence<MachOImage> {
+        #if canImport(Darwin)
         AnySequence(
             (0..<_dyld_image_count())
                 .lazy
@@ -20,6 +21,9 @@ extension MachOImage {
                     MachOImage(ptr: $0)
                 }
         )
+        #else
+        AnySequence([])
+        #endif
     }
 }
 

Sources/MachOKit/MachOImage.swift

@@ -80,6 +80,7 @@ extension MachOImage {
     /// - /usr/lib/swift/libswiftFoundation.dylib
     ///     → libswiftFoundation
     public init?(name: String) {
+        #if canImport(Darwin)
         let indices = 0..<_dyld_image_count()
         let index = indices.first { index in
             guard let pathC = _dyld_get_image_name(index) else {
@@ -99,6 +100,9 @@ extension MachOImage {
         } else {
             return nil
         }
+        #else
+        return nil
+        #endif
     }
 }
 
@@ -107,9 +111,13 @@ extension MachOImage {
     ///
     /// It is the same value that can be obtained by `Dl_info.dli_fname` or `_dyld_get_image_name`.
     public var path: String? {
+        #if canImport(Darwin)
         var info = Dl_info()
         dladdr(ptr, &info)
         return String(cString: info.dli_fname)
+        #else
+        return nil
+        #endif
     }
 
     /// virtual memory address slide of machO image.

Sources/MachOKit/MachOKit.swift

@@ -8,10 +8,9 @@ public enum File {
 public func loadFromFile(url: URL) throws -> File {
     let fileHandle = try FileHandle(forReadingFrom: url)
     let magicRaw: UInt32 = fileHandle.read(offset: 0)
-
-    guard let magic = Magic(rawValue: magicRaw) else {
-        throw NSError() // FIXME: error
-    }
+
+    // FIXME: error instead of unwrap
+    let magic = Magic(rawValue: magicRaw)!
 
     if magic.isFat {
         return .fat(try FatFile(url: url))

Sources/MachOKit/Model/Codesign/CodeDirectory/CodeSignCodeDirectory.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import MachOKitC
-import CommonCrypto
+import Crypto
 
 public struct CodeSignCodeDirectory: LayoutWrapper {
     public typealias Layout = CS_CodeDirectory
@@ -58,28 +58,16 @@ extension CodeSignCodeDirectory {
         in signature: MachOFile.CodeSign
     ) -> Data? {
         let data = signature.data[offset ..< offset + numericCast(layout.length)]
-        let length: CC_LONG = numericCast(layout.length)
 
-        return data.withUnsafeBytes {
-            guard let baseAddress = $0.baseAddress else {
-                return nil
-            }
-            switch hashType {
+        switch hashType {
             case .sha1:
-                var digest = [UInt8](repeating: 0, count: Int(CC_SHA1_DIGEST_LENGTH))
-                CC_SHA1(baseAddress, length, &digest)
-                return Data(digest)
+                return Data(Insecure.SHA1.hash(data: data))
             case .sha256, .sha256_truncated:
-                var digest = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
-                CC_SHA256(baseAddress, length, &digest)
-                return Data(digest)
+                return Data(SHA256.hash(data: data))
             case .sha384:
-                var digest = [UInt8](repeating: 0, count: Int(CC_SHA384_DIGEST_LENGTH))
-                CC_SHA384(baseAddress, length, &digest)
-                return Data(digest)
+                return Data(SHA384.hash(data: data))
             case .none:
                 return nil
-            }
         }
     }
 
@@ -90,28 +78,16 @@ extension CodeSignCodeDirectory {
             bytes: signature.basePointer.advanced(by: offset),
             count: numericCast(layout.length)
         )
-        let length: CC_LONG = numericCast(layout.length)
 
-        return data.withUnsafeBytes {
-            guard let baseAddress = $0.baseAddress else {
-                return nil
-            }
-            switch hashType {
+        switch hashType {
             case .sha1:
-                var digest = [UInt8](repeating: 0, count: Int(CC_SHA1_DIGEST_LENGTH))
-                CC_SHA1(baseAddress, length, &digest)
-                return Data(digest)
+                return Data(Insecure.SHA1.hash(data: data))
             case .sha256, .sha256_truncated:
-                var digest = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
-                CC_SHA256(baseAddress, length, &digest)
-                return Data(digest)
+                return Data(SHA256.hash(data: data))
             case .sha384:
-                var digest = [UInt8](repeating: 0, count: Int(CC_SHA384_DIGEST_LENGTH))
-                CC_SHA384(baseAddress, length, &digest)
-                return Data(digest)
+                return Data(SHA384.hash(data: data))
             case .none:
                 return nil
-            }
         }
     }
 }

Sources/MachOKit/Util/exported.swift

@@ -6,9 +6,11 @@
 //  
 //
 
+#if canImport(MachO)
 @_documentation(visibility: internal) 
 @_exported 
 import MachO
+#endif
 
 @_exported 
 import MachOKitC