Split out into separate files

SecretKit/Common/Erasers/AnySecret.swift

@@ -0,0 +1,48 @@
+import Foundation
+
+public struct AnySecret: Secret {
+
+    let base: Any
+    fileprivate let hashable: AnyHashable
+    fileprivate let _id: () -> AnyHashable
+    fileprivate let _name: () -> String
+    fileprivate let _publicKey: () -> Data
+
+    public init<T>(_ secret: T) where T: Secret {
+        if let secret = secret as? AnySecret {
+            base = secret.base
+            hashable = secret.hashable
+            _id = secret._id
+            _name = secret._name
+            _publicKey = secret._publicKey
+        } else {
+            base = secret as Any
+            self.hashable = secret
+            _id = { secret.id as AnyHashable }
+            _name = { secret.name }
+            _publicKey = { secret.publicKey }
+        }
+    }
+
+    public var id: AnyHashable {
+        return _id()
+    }
+
+    public var name: String {
+        return _name()
+    }
+
+    public var publicKey: Data {
+        return _publicKey()
+    }
+
+    public static func == (lhs: AnySecret, rhs: AnySecret) -> Bool {
+        lhs.hashable == rhs.hashable
+    }
+
+    public func hash(into hasher: inout Hasher) {
+        hashable.hash(into: &hasher)
+    }
+
+}
+

SecretKit/Common/Erasers/AnySecretStore.swift

@@ -0,0 +1,64 @@
+import Foundation
+
+public class AnySecretStore: SecretStore {
+
+    let base: Any
+    fileprivate let _isAvailable: () -> Bool
+    fileprivate let _id: () -> UUID
+    fileprivate let _name: () -> String
+    fileprivate let _secrets: () -> [AnySecret]
+    fileprivate let _sign: (Data, AnySecret) throws -> Data
+
+    public init<SecretStoreType>(_ secretStore: SecretStoreType) where SecretStoreType: SecretStore {
+        base = secretStore
+        _isAvailable = { secretStore.isAvailable }
+        _name = { secretStore.name }
+        _id = { secretStore.id }
+        _secrets = { secretStore.secrets.map { AnySecret($0) } }
+        _sign = { try secretStore.sign(data: $0, with: $1 as! SecretStoreType.SecretType) }
+    }
+
+    public var isAvailable: Bool {
+        return _isAvailable()
+    }
+
+    public var id: UUID {
+        return _id()
+    }
+
+    public var name: String {
+        return _name()
+    }
+
+    public var secrets: [AnySecret] {
+        return _secrets()
+    }
+
+    public func sign(data: Data, with secret: AnySecret) throws -> Data {
+        try _sign(data, secret)
+    }
+
+}
+
+public class AnySecretStoreModifiable: AnySecretStore, SecretStoreModifiable {
+
+    fileprivate let _create: (String, Bool) throws -> Void
+    fileprivate let _delete: (AnySecret) throws -> Void
+
+    public init<SecretStoreType>(modifiable secretStore: SecretStoreType) where SecretStoreType: SecretStoreModifiable {
+        _create = { try secretStore.create(name: $0, requiresAuthentication: $1) }
+        _delete = { try secretStore.delete(secret: $0.base as! SecretStoreType.SecretType) }
+        super.init(secretStore)
+    }
+
+    public func create(name: String, requiresAuthentication: Bool) throws {
+        try _create(name, requiresAuthentication)
+    }
+
+    public func delete(secret: AnySecret) throws {
+        try _delete(secret)
+    }
+
+}
+
+

SecretKit/Common/OpenSSH/OpenSSHReader.swift

@@ -0,0 +1,25 @@
+import Foundation
+
+public class OpenSSHReader {
+
+    var remaining: Data
+
+    public init(data: Data) {
+        remaining = Data(data)
+    }
+
+    public func readNextChunk() throws -> Data {
+        let lengthRange = 0..<(UInt32.bitWidth/8)
+        let lengthChunk = remaining[lengthRange]
+        remaining.removeSubrange(lengthRange)
+        let littleEndianLength = lengthChunk.withUnsafeBytes { pointer in
+            return pointer.load(as: UInt32.self)
+        }
+        let length = Int(littleEndianLength.bigEndian)
+        let dataRange = 0..<length
+        let ret = Data(remaining[dataRange])
+        remaining.removeSubrange(dataRange)
+        return ret
+    }
+
+}

SecretKit/Secret.swift

@@ -4,52 +4,3 @@ public protocol Secret: Identifiable, Hashable {
     var publicKey: Data { get }
 
 }
-
-
-
-public struct AnySecret: Secret {
-
-    let base: Any
-    fileprivate let hashable: AnyHashable
-    fileprivate let _id: () -> AnyHashable
-    fileprivate let _name: () -> String
-    fileprivate let _publicKey: () -> Data
-
-    public init<T>(_ secret: T) where T: Secret {
-        if let secret = secret as? AnySecret {
-            base = secret.base
-            hashable = secret.hashable
-            _id = secret._id
-            _name = secret._name
-            _publicKey = secret._publicKey
-        } else {
-            base = secret as Any
-            self.hashable = secret
-            _id = { secret.id as AnyHashable }
-            _name = { secret.name }
-            _publicKey = { secret.publicKey }
-        }
-    }
-
-    public var id: AnyHashable {
-        return _id()
-    }
-
-    public var name: String {
-        return _name()
-    }
-
-    public var publicKey: Data {
-        return _publicKey()
-    }
-
-    public static func == (lhs: AnySecret, rhs: AnySecret) -> Bool {
-        lhs.hashable == rhs.hashable
-    }
-
-    public func hash(into hasher: inout Hasher) {
-        hashable.hash(into: &hasher)
-    }
-
-}
-

SecretKit/SecretStore.swift

@@ -25,66 +25,3 @@ extension NSNotification.Name {
     static let secretStoreUpdated = NSNotification.Name("com.maxgoedjen.Secretive.secretStore.updated")
 
 }
-
-public class AnySecretStore: SecretStore {
-
-    let base: Any
-    fileprivate let _isAvailable: () -> Bool
-    fileprivate let _id: () -> UUID
-    fileprivate let _name: () -> String
-    fileprivate let _secrets: () -> [AnySecret]
-    fileprivate let _sign: (Data, AnySecret) throws -> Data
-
-    public init<SecretStoreType>(_ secretStore: SecretStoreType) where SecretStoreType: SecretStore {
-        base = secretStore
-        _isAvailable = { secretStore.isAvailable }
-        _name = { secretStore.name }
-        _id = { secretStore.id }
-        _secrets = { secretStore.secrets.map { AnySecret($0) } }
-        _sign = { try secretStore.sign(data: $0, with: $1 as! SecretStoreType.SecretType) }
-    }
-
-    public var isAvailable: Bool {
-        return _isAvailable()
-    }
-
-    public var id: UUID {
-        return _id()
-    }
-
-    public var name: String {
-        return _name()
-    }
-
-    public var secrets: [AnySecret] {
-        return _secrets()
-    }
-
-    public func sign(data: Data, with secret: AnySecret) throws -> Data {
-        try _sign(data, secret)
-    }
-
-}
-
-public class AnySecretStoreModifiable: AnySecretStore, SecretStoreModifiable {
-
-    fileprivate let _create: (String, Bool) throws -> Void
-    fileprivate let _delete: (AnySecret) throws -> Void
-
-    public init<SecretStoreType>(modifiable secretStore: SecretStoreType) where SecretStoreType: SecretStoreModifiable {
-        _create = { try secretStore.create(name: $0, requiresAuthentication: $1) }
-        _delete = { try secretStore.delete(secret: $0.base as! SecretStoreType.SecretType) }
-        super.init(secretStore)
-    }
-
-    public func create(name: String, requiresAuthentication: Bool) throws {
-        try _create(name, requiresAuthentication)
-    }
-
-    public func delete(secret: AnySecret) throws {
-        try _delete(secret)
-    }
-
-}
-
-