Chunk Size Refactor

OperatorFoundation · Dec 28, 2018 · 49c78ae · 49c78ae
1 parent 4c91f60
commit 49c78ae
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/Sources/ReplicantSwift/Polish/PolishController.swift b/Sources/ReplicantSwift/Polish/PolishController.swift
@@ -129,10 +129,8 @@ public struct PolishController
 
     func generateKeyAttributesDictionary() -> CFDictionary
     {
-        let access = SecAccessControlCreateWithFlags(kCFAllocatorDefault,
-                                                     kSecAttrAccessibleAlwaysThisDeviceOnly,
-                                                     .privateKeyUsage,
-                                                     nil)!
+        //FIXME: Secure Enclave
+        //let access = SecAccessControlCreateWithFlags(kCFAllocatorDefault, kSecAttrAccessibleAlwaysThisDeviceOnly, .privateKeyUsage, nil)!
 
         let privateKeyAttributes: [String: Any] = [
             kSecAttrIsPermanent as String: true,
@@ -152,10 +150,8 @@ public struct PolishController
 
     func generateServerKeyAttributesDictionary() -> CFDictionary
     {
-        let access = SecAccessControlCreateWithFlags(kCFAllocatorDefault,
-                                                     kSecAttrAccessibleAlwaysThisDeviceOnly,
-                                                     .privateKeyUsage,
-                                                     nil)!
+        //FIXME: Secure Enclave
+        // let access = SecAccessControlCreateWithFlags(kCFAllocatorDefault, kSecAttrAccessibleAlwaysThisDeviceOnly, .privateKeyUsage, nil)!
 
         let privateKeyAttributes: [String: Any] = [
             kSecAttrIsPermanent as String: true,

diff --git a/Sources/ReplicantSwift/ReplicantConfig.swift b/Sources/ReplicantSwift/ReplicantConfig.swift
@@ -10,12 +10,12 @@ import Foundation
 public struct ReplicantConfig: Codable
 {
     public var serverPublicKey: Data
-    public var chunkSize: Int
+    public var chunkSize: UInt16
     public var chunkTimeout: Int
     public var addSequences: [SequenceModel]?
     public var removeSequences: [SequenceModel]?
 
-    public init?(serverPublicKey: Data, chunkSize: Int, chunkTimeout: Int, addSequences: [SequenceModel]?, removeSequences: [SequenceModel]?)
+    public init?(serverPublicKey: Data, chunkSize: UInt16, chunkTimeout: Int, addSequences: [SequenceModel]?, removeSequences: [SequenceModel]?)
     {
         guard chunkSize >= keySize + aesOverheadSize
         else

diff --git a/Sources/ReplicantSwift/ReplicantConfigTemplate.swift b/Sources/ReplicantSwift/ReplicantConfigTemplate.swift
@@ -9,13 +9,13 @@ import Foundation
 
 public struct ReplicantConfigTemplate: Codable
 {
-    public var chunkSize: Int
+    public var chunkSize: UInt16
     public var chunkTimeout: Int
     public var addSequences: [SequenceModel]?
     public var removeSequences: [SequenceModel]?
 
 
-    public init?(chunkSize: Int, chunkTimeout: Int, addSequences: [SequenceModel]?, removeSequences: [SequenceModel]?)
+    public init?(chunkSize: UInt16, chunkTimeout: Int, addSequences: [SequenceModel]?, removeSequences: [SequenceModel]?)
     {
         guard chunkSize >= keySize + aesOverheadSize
             else

diff --git a/Sources/ReplicantSwift/ReplicantServerConfig.swift b/Sources/ReplicantSwift/ReplicantServerConfig.swift
@@ -9,12 +9,12 @@ import Foundation
 
 public struct ReplicantServerConfig: Codable
 {
-    public var chunkSize: Int
+    public var chunkSize: UInt16
     public var chunkTimeout: Int
     public var addSequences: [SequenceModel]?
     public var removeSequences: [SequenceModel]?
 
-    public init?(serverPublicKey: SecKey, chunkSize: Int, chunkTimeout: Int, addSequences: [SequenceModel]?, removeSequences: [SequenceModel]?)
+    public init?(serverPublicKey: SecKey, chunkSize: UInt16, chunkTimeout: Int, addSequences: [SequenceModel]?, removeSequences: [SequenceModel]?)
     {
         guard chunkSize >= keySize + aesOverheadSize
             else