diff options
Diffstat (limited to 'cpp/test/IceSSL/configuration/TestI.cpp')
| -rw-r--r-- | cpp/test/IceSSL/configuration/TestI.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cpp/test/IceSSL/configuration/TestI.cpp b/cpp/test/IceSSL/configuration/TestI.cpp index 594510c3934..7da838025c3 100644 --- a/cpp/test/IceSSL/configuration/TestI.cpp +++ b/cpp/test/IceSSL/configuration/TestI.cpp @@ -12,6 +12,7 @@ #include <TestI.h> #include <TestCommon.h> #include <IceSSL/Plugin.h> +#include <IceSSL/ConnectionInfo.h> using namespace std; using namespace Ice; @@ -26,8 +27,8 @@ ServerI::noCert(const Ice::Current& c) { try { - IceSSL::NativeConnectionInfoPtr info = ICE_DYNAMIC_CAST(IceSSL::NativeConnectionInfo, c.con->getInfo()); - test(info->nativeCerts.size() == 0); + IceSSL::ConnectionInfoPtr info = ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, c.con->getInfo()); + test(info->certs.size() == 0); } catch(const Ice::LocalException& ex) { @@ -41,23 +42,23 @@ ServerI::checkCert(ICE_IN(string) subjectDN, ICE_IN(string) issuerDN, const Ice: { try { - IceSSL::NativeConnectionInfoPtr info = ICE_DYNAMIC_CAST(IceSSL::NativeConnectionInfo, c.con->getInfo()); + IceSSL::ConnectionInfoPtr info = ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, c.con->getInfo()); test(info->verified); - test(info->nativeCerts.size() == 2); + test(info->certs.size() == 2); if(c.ctx.find("uwp") != c.ctx.end()) { // // UWP client just provide the subject and issuer CN, and not the full Subject and Issuer DN // - string subject(info->nativeCerts[0]->getSubjectDN()); + string subject(info->certs[0]->getSubjectDN()); test(subject.find(subjectDN) != string::npos); - string issuer(info->nativeCerts[0]->getIssuerDN()); + string issuer(info->certs[0]->getIssuerDN()); test(issuer.find(issuerDN) != string::npos); } else { - test(info->nativeCerts[0]->getSubjectDN() == IceSSL::DistinguishedName(subjectDN)); - test(info->nativeCerts[0]->getIssuerDN() == IceSSL::DistinguishedName(issuerDN)); + test(info->certs[0]->getSubjectDN() == IceSSL::DistinguishedName(subjectDN)); + test(info->certs[0]->getIssuerDN() == IceSSL::DistinguishedName(issuerDN)); } } catch(const Ice::LocalException&) @@ -71,7 +72,7 @@ ServerI::checkCipher(ICE_IN(string) cipher, const Ice::Current& c) { try { - IceSSL::NativeConnectionInfoPtr info = ICE_DYNAMIC_CAST(IceSSL::NativeConnectionInfo, c.con->getInfo()); + IceSSL::ConnectionInfoPtr info = ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, c.con->getInfo()); test(info->cipher.compare(0, cipher.size(), cipher) == 0); } catch(const Ice::LocalException&) |