UWP Cache IceSSL connection info

2 files changed, 15 insertions, 10 deletions

diff --git a/cpp/src/IceSSL/UWPTransceiverI.cpp b/cpp/src/IceSSL/UWPTransceiverI.cpp
index 2d44de962c5..b58a688733f 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.cpp
+++ b/cpp/src/IceSSL/UWPTransceiverI.cpp
@@ -198,6 +198,17 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
                 throw SecurityException(__FILE__, __LINE__, "IceSSL: certificate required");
             }
 
+            if(_chain)
+            {
+                auto certs = _chain->GetCertificates(true);
+                for(auto iter = certs->First(); iter->HasCurrent; iter->MoveNext())
+                {
+                    auto cert = ICE_MAKE_SHARED(Certificate, iter->Current);
+                    _nativeCerts.push_back(cert);
+                    _certs.push_back(cert->encode());
+                }
+            }
+
             _engine->verifyPeer(_host, dynamic_pointer_cast<IceSSL::NativeConnectionInfo>(getInfo()), toString());
         }
         catch(Platform::Exception^ ex)
@@ -322,20 +333,12 @@ Ice::ConnectionInfoPtr
 IceSSL::TransceiverI::getInfo() const
 {
     NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo);
-    StreamSocket^ stream = safe_cast<StreamSocket^>(_delegate->getNativeInfo()->fd());
-    if(_chain)
-    {
-        auto certs = _chain->GetCertificates(true);
-        for(auto iter = certs->First(); iter->HasCurrent; iter->MoveNext())
-        {
-            info->nativeCerts.push_back(ICE_MAKE_SHARED(Certificate, iter->Current));
-            info->certs.push_back(info->nativeCerts.back()->encode());
-        }
-    }
     info->verified = _verified;
     info->adapterName = _adapterName;
     info->incoming = _incoming;
     info->underlying = _delegate->getInfo();
+    info->certs = _certs;
+    info->nativeCerts = _nativeCerts;
     return info;
 }
 
diff --git a/cpp/src/IceSSL/UWPTransceiverI.h b/cpp/src/IceSSL/UWPTransceiverI.h
index ddfa63a947b..6535f6ac6ea 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.h
+++ b/cpp/src/IceSSL/UWPTransceiverI.h
@@ -67,7 +67,9 @@ private:
 
     bool _connected;
     bool _upgraded;
+    std::vector<std::string> _certs;
     bool _verified;
+    std::vector<CertificatePtr> _nativeCerts;
     Windows::Security::Cryptography::Certificates::CertificateChain^ _chain;
 };
 typedef IceUtil::Handle<TransceiverI> TransceiverIPtr;