diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-04-25 18:25:05 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-04-25 18:25:05 +0000 |
| commit | 8399fc0295b7c1e00de0c57604d355ea20887d2c (patch) | |
| tree | 9b581d27da5a6ff0a9e187b972db4c0b69f7a209 /cpp/test/IceSSL/configuration/AllTests.cpp | |
| parent | adding generated directory (diff) | |
| download | ice-8399fc0295b7c1e00de0c57604d355ea20887d2c.tar.bz2 ice-8399fc0295b7c1e00de0c57604d355ea20887d2c.tar.xz ice-8399fc0295b7c1e00de0c57604d355ea20887d2c.zip | |
minor cleanup in IceSSL
Diffstat (limited to 'cpp/test/IceSSL/configuration/AllTests.cpp')
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 8757bbc3b05..ae47f324d43 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -320,7 +320,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir) try { IceSSL::CertificatePtr clientCert = - IceSSL::Certificate::readPEMFile(defaultDir + "/c_rsa_nopass_ca1_pub.pem"); + IceSSL::Certificate::load(defaultDir + "/c_rsa_nopass_ca1_pub.pem"); server->checkCert(clientCert->getSubjectDN(), clientCert->getIssuerDN()); // @@ -330,13 +330,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir) // Validate some aspects of the Certificate class. // IceSSL::CertificatePtr serverCert = - IceSSL::Certificate::readPEMFile(defaultDir + "/s_rsa_nopass_ca1_pub.pem"); - test(IceSSL::Certificate::decodePEM(serverCert->getPEMEncoding()) == serverCert); + IceSSL::Certificate::load(defaultDir + "/s_rsa_nopass_ca1_pub.pem"); + test(IceSSL::Certificate::decode(serverCert->encode()) == serverCert); test(serverCert == serverCert); test(serverCert->checkValidity()); test(!serverCert->checkValidity(IceUtil::Time::seconds(0))); - IceSSL::CertificatePtr caCert = IceSSL::Certificate::readPEMFile(defaultDir + "/cacert1.pem"); + IceSSL::CertificatePtr caCert = IceSSL::Certificate::load(defaultDir + "/cacert1.pem"); test(caCert == caCert); test(caCert->checkValidity()); test(!caCert->checkValidity(IceUtil::Time::seconds(0))); @@ -382,7 +382,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir) try { IceSSL::CertificatePtr clientCert = - IceSSL::Certificate::readPEMFile(defaultDir + "/c_rsa_nopass_ca1_pub.pem"); + IceSSL::Certificate::load(defaultDir + "/c_rsa_nopass_ca1_pub.pem"); server->checkCert(clientCert->getSubjectDN(), clientCert->getIssuerDN()); IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(server->ice_connection()); } @@ -650,7 +650,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir) // { IceSSL::CertificatePtr cert = - IceSSL::Certificate::readPEMFile(defaultDir + "/s_rsa_nopass_ca1_exp_pub.pem"); + IceSSL::Certificate::load(defaultDir + "/s_rsa_nopass_ca1_exp_pub.pem"); test(!cert->checkValidity()); } @@ -697,7 +697,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir) // { IceSSL::CertificatePtr cert = - IceSSL::Certificate::readPEMFile(defaultDir + "/c_rsa_nopass_ca1_exp_pub.pem"); + IceSSL::Certificate::load(defaultDir + "/c_rsa_nopass_ca1_exp_pub.pem"); test(!cert->checkValidity()); } initData.properties->setProperty("IceSSL.CertFile", "c_rsa_nopass_ca1_exp_pub.pem"); |