* websocket crash with the core foundation SSL settings (#2574)

couchbase · Nov 8, 2019 · 2106538 · 2106538
1 parent 9f7a4c2
commit 2106538
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/Objective-C/Internal/Replicator/CBLWebSocket.mm b/Objective-C/Internal/Replicator/CBLWebSocket.mm
@@ -289,17 +289,19 @@ - (void) configureTLS {
     _checkSSLCert = false;
     if (_logic.useTLS) {
         CBLLogVerbose(WebSocket, @"%@ enabling TLS", self);
-        auto settings = CFDictionaryCreateMutable(nullptr, 0, nullptr, nullptr);
-        if (_connectedThruProxy) {
-            CFDictionarySetValue(settings, kCFStreamSSLPeerName,
-                                 (__bridge CFStringRef)_logic.directHost);
-        }
+        NSMutableDictionary* settings = [NSMutableDictionary dictionary];
+        if (_connectedThruProxy)
+            [settings setObject: _logic.directHost
+                         forKey: (__bridge id)kCFStreamSSLPeerName];
+
         if (_options[kC4ReplicatorOptionPinnedServerCert])
-            CFDictionarySetValue(settings, kCFStreamSSLValidatesCertificateChain,
-                                 kCFBooleanFalse);
-        CFReadStreamSetProperty((__bridge CFReadStreamRef)_in,
-                                kCFStreamPropertySSLSettings, settings);
-        CFRelease(settings);
+            [settings setObject: @NO
+                         forKey: (__bridge id)kCFStreamSSLValidatesCertificateChain];
+
+        if (![_in setProperty: settings
+                       forKey: (__bridge NSString *)kCFStreamPropertySSLSettings]) {
+            CBLWarnError(WebSocket, @"%@ failed to set SSL settings", self);
+        }
         _checkSSLCert = true;
     }
 }