summaryrefslogtreecommitdiff
path: root/java/ssl/jdk1.5/IceSSL/ConnectorI.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/ssl/jdk1.5/IceSSL/ConnectorI.java')
-rw-r--r--java/ssl/jdk1.5/IceSSL/ConnectorI.java144
1 files changed, 72 insertions, 72 deletions
diff --git a/java/ssl/jdk1.5/IceSSL/ConnectorI.java b/java/ssl/jdk1.5/IceSSL/ConnectorI.java
index 4e1400cfc1e..b65aa49701b 100644
--- a/java/ssl/jdk1.5/IceSSL/ConnectorI.java
+++ b/java/ssl/jdk1.5/IceSSL/ConnectorI.java
@@ -14,91 +14,91 @@ final class ConnectorI implements IceInternal.Connector
public IceInternal.Transceiver
connect(int timeout)
{
- //
- // The plugin may not be fully initialized.
- //
- if(!_instance.initialized())
- {
- Ice.PluginInitializationException ex = new Ice.PluginInitializationException();
- ex.reason = "IceSSL: plugin is not initialized";
- throw ex;
- }
+ //
+ // The plugin may not be fully initialized.
+ //
+ if(!_instance.initialized())
+ {
+ Ice.PluginInitializationException ex = new Ice.PluginInitializationException();
+ ex.reason = "IceSSL: plugin is not initialized";
+ throw ex;
+ }
- if(_instance.networkTraceLevel() >= 2)
- {
- String s = "trying to establish ssl connection to " + toString();
- _logger.trace(_instance.networkTraceCategory(), s);
- }
+ if(_instance.networkTraceLevel() >= 2)
+ {
+ String s = "trying to establish ssl connection to " + toString();
+ _logger.trace(_instance.networkTraceCategory(), s);
+ }
- java.nio.channels.SocketChannel fd = IceInternal.Network.createTcpSocket();
- IceInternal.Network.setBlock(fd, false);
- IceInternal.Network.doConnect(fd, _addr, timeout);
+ java.nio.channels.SocketChannel fd = IceInternal.Network.createTcpSocket();
+ IceInternal.Network.setBlock(fd, false);
+ IceInternal.Network.doConnect(fd, _addr, timeout);
- TransceiverI transceiver = null;
- try
- {
- javax.net.ssl.SSLEngine engine = _instance.createSSLEngine(false);
+ TransceiverI transceiver = null;
+ try
+ {
+ javax.net.ssl.SSLEngine engine = _instance.createSSLEngine(false);
- transceiver = new TransceiverI(_instance, engine, fd, _host, false, "");
+ transceiver = new TransceiverI(_instance, engine, fd, _host, false, "");
/*
- transceiver.waitForHandshake(timeout);
+ transceiver.waitForHandshake(timeout);
- //
- // Check IceSSL.VerifyPeer.
- //
- int verifyPeer =
- _instance.communicator().getProperties().getPropertyAsIntWithDefault("IceSSL.VerifyPeer", 2);
- if(verifyPeer > 0)
- {
- try
- {
- engine.getSession().getPeerCertificates();
- }
- catch(javax.net.ssl.SSLPeerUnverifiedException ex)
- {
- Ice.SecurityException e = new Ice.SecurityException();
- e.reason = "IceSSL: server did not supply a certificate";
- e.initCause(ex);
- throw e;
- }
- }
+ //
+ // Check IceSSL.VerifyPeer.
+ //
+ int verifyPeer =
+ _instance.communicator().getProperties().getPropertyAsIntWithDefault("IceSSL.VerifyPeer", 2);
+ if(verifyPeer > 0)
+ {
+ try
+ {
+ engine.getSession().getPeerCertificates();
+ }
+ catch(javax.net.ssl.SSLPeerUnverifiedException ex)
+ {
+ Ice.SecurityException e = new Ice.SecurityException();
+ e.reason = "IceSSL: server did not supply a certificate";
+ e.initCause(ex);
+ throw e;
+ }
+ }
*/
/*
- if(!ctx.verifyPeer(fd, _host, false))
- {
- Ice.SecurityException ex = new Ice.SecurityException();
- ex.reason = "IceSSL: outgoing connection rejected by certificate verifier";
- throw ex;
- }
+ if(!ctx.verifyPeer(fd, _host, false))
+ {
+ Ice.SecurityException ex = new Ice.SecurityException();
+ ex.reason = "IceSSL: outgoing connection rejected by certificate verifier";
+ throw ex;
+ }
*/
- }
- catch(RuntimeException ex)
- {
- try
- {
- fd.close();
- }
- catch(java.io.IOException e)
- {
- // Ignore.
- }
- throw ex;
- }
+ }
+ catch(RuntimeException ex)
+ {
+ try
+ {
+ fd.close();
+ }
+ catch(java.io.IOException e)
+ {
+ // Ignore.
+ }
+ throw ex;
+ }
- if(_instance.networkTraceLevel() >= 1)
- {
- String s = "ssl connection established\n" + IceInternal.Network.fdToString(fd);
- _logger.trace(_instance.networkTraceCategory(), s);
- }
+ if(_instance.networkTraceLevel() >= 1)
+ {
+ String s = "ssl connection established\n" + IceInternal.Network.fdToString(fd);
+ _logger.trace(_instance.networkTraceCategory(), s);
+ }
- return transceiver;
+ return transceiver;
}
public String
toString()
{
- return IceInternal.Network.addrToString(_addr);
+ return IceInternal.Network.addrToString(_addr);
}
//
@@ -106,11 +106,11 @@ final class ConnectorI implements IceInternal.Connector
//
ConnectorI(Instance instance, String host, int port)
{
- _instance = instance;
- _host = host;
- _logger = instance.communicator().getLogger();
+ _instance = instance;
+ _host = host;
+ _logger = instance.communicator().getLogger();
- _addr = IceInternal.Network.getAddress(host, port);
+ _addr = IceInternal.Network.getAddress(host, port);
}
private Instance _instance;