diff options
| author | Anthony Neal <aneal@zeroc.com> | 2002-10-29 18:44:20 +0000 |
|---|---|---|
| committer | Anthony Neal <aneal@zeroc.com> | 2002-10-29 18:44:20 +0000 |
| commit | 8597953fa6e03ab064f536ce7056628fb54b8674 (patch) | |
| tree | c4c2129f39ca2cfa99f1f8335ee12f534f32fff4 /cpp/src/IceSSL/ClientContext.cpp | |
| parent | Minor fixes. (diff) | |
| download | ice-8597953fa6e03ab064f536ce7056628fb54b8674.tar.bz2 ice-8597953fa6e03ab064f536ce7056628fb54b8674.tar.xz ice-8597953fa6e03ab064f536ce7056628fb54b8674.zip | |
Implemented connect-time handshaking.
Diffstat (limited to 'cpp/src/IceSSL/ClientContext.cpp')
| -rw-r--r-- | cpp/src/IceSSL/ClientContext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/ClientContext.cpp b/cpp/src/IceSSL/ClientContext.cpp index 95331f60d1c..da7ea42bcec 100644 --- a/cpp/src/IceSSL/ClientContext.cpp +++ b/cpp/src/IceSSL/ClientContext.cpp @@ -54,7 +54,7 @@ IceSSL::ClientContext::configure(const GeneralConfig& generalConfig, } IceSSL::SslTransceiverPtr -IceSSL::ClientContext::createTransceiver(int socket, const OpenSSLPluginIPtr& plugin) +IceSSL::ClientContext::createTransceiver(int socket, const OpenSSLPluginIPtr& plugin, int timeout) { if(_sslContext == 0) { @@ -66,7 +66,7 @@ IceSSL::ClientContext::createTransceiver(int socket, const OpenSSLPluginIPtr& pl SSL* ssl = createSSLConnection(socket); SslTransceiverPtr transceiver = new SslClientTransceiver(plugin, socket, _certificateVerifier, ssl); - transceiverSetup(transceiver); + transceiverSetup(transceiver, timeout); return transceiver; } @@ -80,6 +80,6 @@ IceSSL::ClientContext::ClientContext(const TraceLevelsPtr& traceLevels, const Lo _dsaPrivateKeyProperty = "IceSSL.Client.Overrides.DSA.PrivateKey"; _dsaPublicKeyProperty = "IceSSL.Client.Overrides.DSA.Certificate"; _caCertificateProperty = "IceSSL.Client.Overrides.CACertificate"; - _handshakeTimeoutProperty = "IceSSL.Client.Handshake.ReadTimeout"; _passphraseRetriesProperty = "IceSSL.Client.Passphrase.Retries"; + _connectionHandshakeRetries = "IceSSL.Client.Handshake.Retries"; } |