证书读取逻辑调整

BinaryParadise · Oct 12, 2021 · b2e247f · b2e247f
1 parent ec43679
commit b2e247f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Sources/PracticeTLS/Logger/PracticeLog.swift b/Sources/PracticeTLS/Logger/PracticeLog.swift
@@ -24,7 +24,7 @@ public struct LogFlag: OptionSet {
     public static let all: LogFlag = [.error, .warning, .info, .debug, .verbose]
 }
 
-public var dynamicLogLevel: LogFlag = .debug
+public var dynamicLogLevel: LogFlag = .info
 
 @inlinable
 public func LogError(_ message: @autoclosure () -> String,

diff --git a/Sources/PracticeTLS/TLS/PEMFileIdentity.swift b/Sources/PracticeTLS/TLS/PEMFileIdentity.swift
@@ -11,10 +11,13 @@ import Foundation
 public class PEMFileIdentity
 {
     public var certificateChain: [X509.Certificate]
+    public var publicPEM: String
+    public var privatePEM: String
 
     public init?(certificateFile: String, privateKeyFile: String)
     {
-
+        publicPEM = certificateFile
+        privatePEM = privateKeyFile
         certificateChain = []
         for (section, object) in ASN1Parser.sectionsFromPEMFile(certificateFile) {
             switch section {

diff --git a/Sources/PracticeTLS/TLS/TLSSessionManager.swift b/Sources/PracticeTLS/TLS/TLSSessionManager.swift
@@ -20,9 +20,8 @@ public class TLSSessionManager: NSObject {
     public static var shared = TLSSessionManager()
     public var identity: Identity? = nil {
         willSet {
-            if let cert = newValue?.certificateChain.last {
-
-                try? RSAEncryptor.shared.setup(publicPEM: String(contentsOfFile: Bundle.certBundle().path(forResource: "Cert/public.pem", ofType: nil)!), privatePEM: String(contentsOfFile: Bundle.certBundle().path(forResource: "Cert/private.pem", ofType: nil)!))
+            if let pemIdentity = newValue as? PEMFileIdentity {
+                try? RSAEncryptor.shared.setup(publicPEM: String(contentsOfFile: pemIdentity.publicPEM), privatePEM: String(contentsOfFile: pemIdentity.privatePEM))
             }
         }
     }