gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Correct initialization of SSL socket

Browse source
This commit is contained in:
Sergey Yershov 2016-10-21 19:37:54 +03:00
parent 671f29af91
commit 9e736d00a5
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/socket.hpp
View file

@ -25,5 +25,5 @@ public:
virtual void SetTimeout(uint32_t milliseconds) = 0;
};
unique_ptr<Socket> createSocket();
unique_ptr<Socket> CreateSocket();
} // namespace platform

19
platform/socket_apple.mm
View file

@ -30,17 +30,19 @@
CFReadStreamRef readStream;
CFWriteStreamRef writeStream;
CFStreamCreatePairWithSocketToHost(NULL, (__bridge CFStringRef)(host), port, &readStream,
CFStreamCreatePairWithSocketToHost(NULL, (__bridge CFStringRef)(host), (UInt32)port, &readStream,
&writeStream);
NSDictionary * settings = @{(id)kCFStreamSSLValidatesCertificateChain : @NO,
(id)kCFStreamSSLLevel : (id)kCFStreamSocketSecurityLevelTLSv1,
};
CFReadStreamSetProperty(readStream, kCFStreamPropertySSLSettings, (CFTypeRef)settings);
CFWriteStreamSetProperty(writeStream, kCFStreamPropertySSLSettings, (CFTypeRef)settings);
self.inputStream = (__bridge_transfer NSInputStream *)readStream;
self.outputStream = (__bridge_transfer NSOutputStream *)writeStream;
[self.inputStream setProperty:NSStreamSocketSecurityLevelNegotiatedSSL
forKey:NSStreamSocketSecurityLevelKey];
[self.outputStream setProperty:NSStreamSocketSecurityLevelNegotiatedSSL
forKey:NSStreamSocketSecurityLevelKey];
[self.inputStream open];
[self.outputStream open];
@ -113,8 +115,9 @@
if (!self.outputStream || self.outputStream.streamStatus != NSStreamStatusOpen)
return NO;
NSDate * writeStart = [NSDate date];
uint8_t const * writePtr = data;
NSDate * writeStart = [NSDate date];
while (count != 0 && [[NSDate date] timeIntervalSinceDate:writeStart] < self.timeout)
{
NSInteger const writeCount = [self.outputStream write:writePtr maxLength:count];
@ -164,7 +167,7 @@ private:
SocketImpl * m_socketImpl = nullptr;
};
unique_ptr<Socket> createSocket()
unique_ptr<Socket> CreateSocket()
{
return make_unique<PlatformSocket>();
}