diff options
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/src/Ice/SslTransceiver.cpp | 12 | ||||
-rw-r--r-- | cpp/test/Glacier/starter/Client.cpp | 5 |
2 files changed, 6 insertions, 11 deletions
diff --git a/cpp/src/Ice/SslTransceiver.cpp b/cpp/src/Ice/SslTransceiver.cpp index f9a4dde64ae..a1148b8813a 100644 --- a/cpp/src/Ice/SslTransceiver.cpp +++ b/cpp/src/Ice/SslTransceiver.cpp @@ -8,7 +8,7 @@ // // ********************************************************************** -#include <Ice/OpenSSL.h>
+#include <Ice/OpenSSL.h> #include <Ice/SslConnection.h> #include <Ice/SslTransceiver.h> #include <Ice/Instance.h> @@ -63,7 +63,7 @@ IceInternal::SslTransceiver::shutdown() void IceInternal::SslTransceiver::write(Buffer& buf, int timeout) -{
+{ _sslConnection->write(buf, timeout); } @@ -72,10 +72,10 @@ IceInternal::SslTransceiver::read(Buffer& buf, int timeout) { if (!_sslConnection->read(buf, timeout)) { - if (_traceLevels->security >= IceSSL::SECURITY_WARNINGS)
- {
- _logger->trace(_traceLevels->securityCat, "WRN Connection::read() returning no bytes read.");
- }
+ if (_traceLevels->security >= IceSSL::SECURITY_WARNINGS) + { + _logger->trace(_traceLevels->securityCat, "WRN Connection::read() returning no bytes read."); + } } } diff --git a/cpp/test/Glacier/starter/Client.cpp b/cpp/test/Glacier/starter/Client.cpp index 30aa9faeb20..5f515b47a72 100644 --- a/cpp/test/Glacier/starter/Client.cpp +++ b/cpp/test/Glacier/starter/Client.cpp @@ -68,7 +68,6 @@ CallbackClient::run(int argc, char* argv[]) try { router = starter->startRouter("", "", privateKey, publicKey, routerCert); - cerr << "Got a router!" << endl; } catch (const Glacier::CannotStartRouterException& ex) { @@ -90,13 +89,9 @@ CallbackClient::run(int argc, char* argv[]) IceSSL::SystemPtr sslSystem = communicator()->getSslSystem(); IceSSL::SslExtensionPtr sslExtension = communicator()->getSslExtension(); - cerr << "about to configure." << endl; - // Configure Server, client is already configured sslSystem->configure(IceSSL::Server); - cerr << "configured." << endl; - sslSystem->setCertificateVerifier(IceSSL::ClientServer, sslExtension->getSingleCertVerifier(routerCert)); // Set the keys overrides. |