Bug fix

OperatorFoundation · Dec 18, 2018 · 896d309 · 896d309
1 parent 620fd88
commit 896d309
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Sources/ReplicantSwift/Polish/PolishClientModel.swift b/Sources/ReplicantSwift/Polish/PolishClientModel.swift
@@ -9,7 +9,7 @@ import Foundation
 
 public class PolishClientModel
 {
-    let controller = PolishController()
+    public let controller = PolishController()
 
     public var serverPublicKey: SecKey
     public var publicKey: SecKey

diff --git a/Sources/ReplicantSwift/Polish/PolishServerModel.swift b/Sources/ReplicantSwift/Polish/PolishServerModel.swift
@@ -9,16 +9,25 @@ import Foundation
 
 public class PolishServerModel
 {
-    let controller = PolishController()
+    public let controller = PolishController()
 
+    public var clientPublicKey: SecKey?
     public var publicKey: SecKey
     public var privateKey: SecKey
 
 
-    public init?()
+    public init?(clientPublicKeyData: Data? = nil)
     {
         controller.deleteKeys()
 
+        if let publicKeyData = clientPublicKeyData
+        {
+           if let cPublicKey = controller.decodeKey(fromData: publicKeyData)
+           {
+                self.clientPublicKey = cPublicKey
+           }
+        }
+
         guard let newKeyPair = controller.generateKeyPair()
             else
         {