Update SSLConnectionInfo

zeroc-ice · Nov 27, 2024 · c062ed8 · c062ed8
1 parent b1ef3b4
commit c062ed8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/swift/src/Ice/Connection.swift b/swift/src/Ice/Connection.swift
@@ -237,22 +237,7 @@ public final class SSLConnectionInfo: ConnectionInfo {
     /// The certificate chain.
     public let peerCertificate: SecCertificate?
 
-    internal init(underlying: ConnectionInfo, peerCertificate: String) {
-        let beginPrefix = "-----BEGIN CERTIFICATE-----\n"
-        let endPrefix = "\n-----END CERTIFICATE-----\n"
-
-        var raw = peerCertificate
-        if raw.hasPrefix(beginPrefix) {
-            raw = String(raw.dropFirst(beginPrefix.count))
-            raw = String(raw.dropLast(endPrefix.count))
-        }
-
-        var peerCertificate: SecCertificate? = nil
-        if let data = NSData(base64Encoded: raw, options: .ignoreUnknownCharacters) {
-            if let cert = SecCertificateCreateWithData(kCFAllocatorDefault, data) {
-                peerCertificate = cert
-            }
-        }
+    internal init(underlying: ConnectionInfo, peerCertificate: SecCertificate?) {
         self.peerCertificate = peerCertificate
         super.init(underlying: underlying)
     }

diff --git a/swift/src/Ice/ConnectionInfoFactory.swift b/swift/src/Ice/ConnectionInfoFactory.swift
@@ -59,7 +59,23 @@ class ConnectionInfoFactory: ICEConnectionInfoFactory {
     }
 
     static func createSSLConnectionInfo(_ underlying: Any, peerCertificate: String) -> Any {
-        SSLConnectionInfo(underlying: underlying as! ConnectionInfo, peerCertificate: peerCertificate)
+        let beginPrefix = "-----BEGIN CERTIFICATE-----\n"
+        let endPrefix = "\n-----END CERTIFICATE-----\n"
+
+        var raw = peerCertificate
+        if raw.hasPrefix(beginPrefix) {
+            raw = String(raw.dropFirst(beginPrefix.count))
+            raw = String(raw.dropLast(endPrefix.count))
+        }
+
+        var decodedPeerCertificate: SecCertificate? = nil
+         if let data = NSData(base64Encoded: raw, options: .ignoreUnknownCharacters) {
+            if let cert = SecCertificateCreateWithData(kCFAllocatorDefault, data) {
+                decodedPeerCertificate = cert
+            }
+        }
+
+        return SSLConnectionInfo(underlying: underlying as! ConnectionInfo, peerCertificate: decodedPeerCertificate)
     }
 
     static func createIAPConnectionInfo(