summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/UWPTransceiverI.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-03-20 11:11:16 +0100
committerJose <jose@zeroc.com>2017-03-20 11:11:16 +0100
commit11c1140a8041b3dcdd79b9244422e56ebe8da10c (patch)
tree04cba9afe9ec7fb3e723ca45cb76afcfb5cc4885 /cpp/src/IceSSL/UWPTransceiverI.cpp
parentFixed (ICE-7678) - Python build failure with VS 2015 (diff)
downloadice-11c1140a8041b3dcdd79b9244422e56ebe8da10c.tar.bz2
ice-11c1140a8041b3dcdd79b9244422e56ebe8da10c.tar.xz
ice-11c1140a8041b3dcdd79b9244422e56ebe8da10c.zip
Update IceSSL::ConnectionInfo to use native certs and remove NativeConnectionInfo
Diffstat (limited to 'cpp/src/IceSSL/UWPTransceiverI.cpp')
-rw-r--r--cpp/src/IceSSL/UWPTransceiverI.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/IceSSL/UWPTransceiverI.cpp b/cpp/src/IceSSL/UWPTransceiverI.cpp
index b2b1b3f1992..ce90e33ab73 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.cpp
+++ b/cpp/src/IceSSL/UWPTransceiverI.cpp
@@ -197,12 +197,11 @@ UWP::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buff
for(auto iter = certs->First(); iter->HasCurrent; iter->MoveNext())
{
auto cert = UWP::Certificate::create(iter->Current);
- _nativeCerts.push_back(cert);
- _certs.push_back(cert->encode());
+ _certs.push_back(cert);
}
}
- _engine->verifyPeer(_host, dynamic_pointer_cast<IceSSL::NativeConnectionInfo>(getInfo()), toString());
+ _engine->verifyPeer(_host, dynamic_pointer_cast<IceSSL::ConnectionInfo>(getInfo()), toString());
}
catch(Platform::Exception^ ex)
{
@@ -347,13 +346,12 @@ UWP::TransceiverI::toDetailedString() const
Ice::ConnectionInfoPtr
UWP::TransceiverI::getInfo() const
{
- NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo);
+ ConnectionInfoPtr info = ICE_MAKE_SHARED(ConnectionInfo);
info->verified = _verified;
info->adapterName = _adapterName;
info->incoming = _incoming;
info->underlying = _delegate->getInfo();
info->certs = _certs;
- info->nativeCerts = _nativeCerts;
return info;
}