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 /cpp/src/Glacier2/SessionRouterI.cpp | |
| 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 'cpp/src/Glacier2/SessionRouterI.cpp')
| -rw-r--r-- | cpp/src/Glacier2/SessionRouterI.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp index 19ca27d2d8a..cd150de5fa2 100644 --- a/cpp/src/Glacier2/SessionRouterI.cpp +++ b/cpp/src/Glacier2/SessionRouterI.cpp @@ -477,7 +477,7 @@ CreateSession::CreateSession(const SessionRouterIPtr& sessionRouter, const strin _context["_con.cipher"] = info->cipher; if(info->certs.size() > 0) { - _context["_con.peerCert"] = info->certs[0]; + _context["_con.peerCert"] = info->certs[0]->encode(); } } } @@ -853,10 +853,13 @@ SessionRouterI::createSessionFromSecureConnection_async( sslinfo.localPort = ipInfo->localPort; sslinfo.localHost = ipInfo->localAddress; sslinfo.cipher = info->cipher; - sslinfo.certs = info->certs; + for(std::vector<IceSSL::CertificatePtr>::const_iterator i = info->certs.begin(); i != info->certs.end(); ++i) + { + sslinfo.certs.push_back((*i)->encode()); + } if(info->certs.size() > 0) { - userDN = IceSSL::Certificate::decode(info->certs[0])->getSubjectDN(); + userDN = info->certs[0]->getSubjectDN(); } } catch(const IceSSL::CertificateEncodingException&) |