Skip to content

Turn off WebSocket SSL pinning #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 21, 2017
Merged

Turn off WebSocket SSL pinning #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
089d9ac
Pick a SRWebSocket change about SSL pinning
tang3w Aug 20, 2017
0a92acc
Turn off WebSocket SSL pinning
tang3w Aug 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion AVOS/AVOSCloudIM/Vendor/SocketRocket/AVIMWebSocket.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,7 +1543,9 @@ - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode;
}
assert(_readBuffer);

if (!_secure && self.readyState == AVIM_CONNECTING && aStream == _inputStream) {
// didConnect fires after certificate verification if we're using pinned certificates.
BOOL usingPinnedCerts = [[_urlRequest AVIM_SSLPinnedCertificates] count] > 0;
if ((!_secure || !usingPinnedCerts) && self.readyState == AVIM_CONNECTING && aStream == _inputStream) {
[self didConnect];
}
[self _pumpWriting];
Expand Down
5 changes: 0 additions & 5 deletions AVOS/AVOSCloudIM/WebSocket/AVIMWebSocketWrapper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,11 +497,6 @@ - (void)internalOpenWebSocketConnection:(NSString *)server {
_webSocket = [[AVIMWebSocket alloc] initWithURLRequest:request];
}

if (self.security) {
request.AVIM_SSLPinnedCertificates = [self pinnedCertificates];
_webSocket.SSLPinningMode = AVIMSSLPinningModePublicKey;
}

_webSocket.delegate = self;
[_webSocket open];
}
Expand Down