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/ServerContext.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/ServerContext.cpp')
| -rw-r--r-- | cpp/src/IceSSL/ServerContext.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceSSL/ServerContext.cpp b/cpp/src/IceSSL/ServerContext.cpp index ae025a0af64..9d3ac620fcf 100644 --- a/cpp/src/IceSSL/ServerContext.cpp +++ b/cpp/src/IceSSL/ServerContext.cpp @@ -75,7 +75,7 @@ IceSSL::ServerContext::configure(const GeneralConfig& generalConfig, } IceSSL::SslTransceiverPtr -IceSSL::ServerContext::createTransceiver(int socket, const OpenSSLPluginIPtr& plugin) +IceSSL::ServerContext::createTransceiver(int socket, const OpenSSLPluginIPtr& plugin, int timeout) { if(_sslContext == 0) { @@ -87,7 +87,7 @@ IceSSL::ServerContext::createTransceiver(int socket, const OpenSSLPluginIPtr& pl SSL* ssl = createSSLConnection(socket); SslTransceiverPtr transceiver = new SslServerTransceiver(plugin, socket, _certificateVerifier, ssl); - transceiverSetup(transceiver); + transceiverSetup(transceiver, timeout); return transceiver; } @@ -105,8 +105,8 @@ IceSSL::ServerContext::ServerContext(const TraceLevelsPtr& traceLevels, const Lo _dsaPrivateKeyProperty = "IceSSL.Server.Overrides.DSA.PrivateKey"; _dsaPublicKeyProperty = "IceSSL.Server.Overrides.DSA.Certificate"; _caCertificateProperty = "IceSSL.Server.Overrides.CACertificate"; - _handshakeTimeoutProperty = "IceSSL.Server.Handshake.ReadTimeout"; - _passphraseRetriesProperty = "IceSSL.Client.Passphrase.Retries"; + _passphraseRetriesProperty = "IceSSL.Server.Passphrase.Retries"; + _connectionHandshakeRetries = "IceSSL.Server.Handshake.Retries"; } void |