diff options
| author | Jose <jose@zeroc.com> | 2017-03-20 11:11:16 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-03-20 11:11:16 +0100 |
| commit | 11c1140a8041b3dcdd79b9244422e56ebe8da10c (patch) | |
| tree | 04cba9afe9ec7fb3e723ca45cb76afcfb5cc4885 /objective-c/src | |
| parent | Fixed (ICE-7678) - Python build failure with VS 2015 (diff) | |
| download | ice-11c1140a8041b3dcdd79b9244422e56ebe8da10c.tar.bz2 ice-11c1140a8041b3dcdd79b9244422e56ebe8da10c.tar.xz ice-11c1140a8041b3dcdd79b9244422e56ebe8da10c.zip | |
Update IceSSL::ConnectionInfo to use native certs and remove NativeConnectionInfo
Diffstat (limited to 'objective-c/src')
| -rw-r--r-- | objective-c/src/IceSSL/ConnectionInfoI.mm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/objective-c/src/IceSSL/ConnectionInfoI.mm b/objective-c/src/IceSSL/ConnectionInfoI.mm index 91dfd31199a..a836f065b75 100644 --- a/objective-c/src/IceSSL/ConnectionInfoI.mm +++ b/objective-c/src/IceSSL/ConnectionInfoI.mm @@ -14,6 +14,8 @@ #include <IceSSL/ConnectionInfo.h> +using namespace std; + @implementation ICESSLConnectionInfo (IceSSL) +(void) load @@ -26,8 +28,14 @@ self = [super initWithConnectionInfo:sslConnectionInfo]; if(self) { + Ice::StringSeq sslCerts; + for(vector<IceSSL::CertificatePtr>::const_iterator i = sslConnectionInfo->certs.begin(); + i != sslConnectionInfo->certs.end(); ++i) + { + sslCerts.push_back((*i)->encode()); + } self->cipher = [[NSString alloc] initWithUTF8String:sslConnectionInfo->cipher.c_str()]; - self->certs = toNSArray(sslConnectionInfo->certs); + self->certs = toNSArray(sslCerts); self->verified = sslConnectionInfo->verified; } return self; |