1 files changed, 254 insertions, 254 deletions
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java
index f5afd53aba..21223445f1 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java
@@ -1,254 +1,254 @@
-/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
- *    Caspar De Groot (No Magic Asia Ltd.) - initial API and implementation
- */
-package org.eclipse.net4j.tcp.ssl;
-
-import org.eclipse.net4j.internal.tcp.TCPAcceptorFactory;
-import org.eclipse.net4j.internal.tcp.TCPConnectorFactory;
-import org.eclipse.net4j.internal.tcp.ssl.SSLAcceptorFactory;
-import org.eclipse.net4j.internal.tcp.ssl.SSLConnectorFactory;
-import org.eclipse.net4j.internal.tcp.ssl.SSLProperties;
-import org.eclipse.net4j.tcp.ITCPAcceptor;
-import org.eclipse.net4j.tcp.ITCPConnector;
-import org.eclipse.net4j.tcp.TCPUtil;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-
-/**
- * A utility class with various static factory and convenience methods for SSL transport.
- * 
- * @author Teerawat Chaiyakijpichet (No Magic Asia Ltd.)
- * @author Caspar De Groot (No Magic Asia Ltd.)
- * @since 4.0
- */
-public class SSLUtil
-{
-  /**
-   * The variable for SSL Engine
-   */
-  private static final String PROTOCOL = "TLS";
-
-  private static String configFile;
-
-  private static String keyPathVar;
-
-  private static String trustPathVar;
-
-  private static String passPhraseVar;
-
-  /**
-   * Default value of handshake timeout is 12 times.
-   */
-  private static int handShakeTimeOutVar = 12;
-
-  /**
-   * Default value of handshake wait time is 60 milliseconds.
-   */
-  private static int handShakeWaitTimeVar = 60;
-
-  public static synchronized void setDefaultSSLConfiguration(String keyPath, String trustPath, String passPhrase)
-  {
-    keyPathVar = keyPath;
-    trustPathVar = trustPath;
-    passPhraseVar = passPhrase;
-  }
-
-  public static synchronized void setDefaultSSLConfiguration(String keyPath, String trustPath, String passPhrase,
-      int handShakeTimeOut, int handShakeWaitTime)
-  {
-    setDefaultSSLConfiguration(keyPath, trustPath, passPhrase);
-
-    handShakeTimeOutVar = handShakeTimeOut;
-    handShakeWaitTimeVar = handShakeWaitTime;
-  }
-
-  public static synchronized void setSSLConfigurationFile(String file)
-  {
-    configFile = file;
-  }
-
-  public static synchronized void prepareContainer(IManagedContainer container)
-  {
-    TCPUtil.prepareContainer(container);
-
-    // Prepare SSL
-    container.registerFactory(new SSLAcceptorFactory());
-    container.registerFactory(new SSLConnectorFactory());
-  }
-
-  public static synchronized ITCPAcceptor getAcceptor(IManagedContainer container, String description)
-  {
-    return (ITCPAcceptor)container.getElement(TCPAcceptorFactory.PRODUCT_GROUP, SSLAcceptorFactory.TYPE, description);
-  }
-
-  public static synchronized ITCPConnector getConnector(IManagedContainer container, String description)
-  {
-    return (ITCPConnector)container
-        .getElement(TCPConnectorFactory.PRODUCT_GROUP, SSLConnectorFactory.TYPE, description);
-  }
-
-  public static synchronized SSLEngine createSSLEngine(boolean client, String host, int port)
-      throws NoSuchAlgorithmException, KeyStoreException, CertificateException, IOException, UnrecoverableKeyException,
-      KeyManagementException
-  {
-    // Get values from the system properties.
-    SSLProperties sslProperties = new SSLProperties();
-    String keyPath = sslProperties.getKeyPath();
-    String trustPath = sslProperties.getTrustPath();
-    String passPhrase = sslProperties.getPassPhrase();
-
-    if ((keyPath == null || trustPath == null || passPhrase == null) && configFile != null)
-    {
-      sslProperties.load(configFile);
-    }
-
-    // In case, the system properties does not have the key path property. It will load from local config file.
-    if (keyPath == null)
-    {
-      keyPath = sslProperties.getKeyPath();
-      if (keyPath == null)
-      {
-        keyPath = keyPathVar;
-      }
-    }
-
-    // In case, the system properties does not have the trust path property. It will load from local config file.
-    if (trustPath == null)
-    {
-      trustPath = sslProperties.getTrustPath();
-      if (trustPath == null)
-      {
-        trustPath = trustPathVar;
-      }
-    }
-
-    // In case, the system properties does not have the passphrase property. It will load from local config file.
-    if (passPhrase == null)
-    {
-      passPhrase = sslProperties.getPassPhrase();
-      if (passPhrase == null)
-      {
-        passPhrase = passPhraseVar;
-      }
-    }
-
-    // Handle assign the value of handshake timeout and handshake timewait from local properties or system properties by
-    // giving the value form system properties is high priority.
-    String value = sslProperties.getHandShakeTimeOut();
-    if (value != null)
-    {
-      handShakeTimeOutVar = Integer.parseInt(value);
-    }
-
-    value = sslProperties.getHandShakeWaitTime();
-    if (value != null)
-    {
-      handShakeWaitTimeVar = Integer.parseInt(value);
-    }
-
-    if (keyPath == null && !client || trustPath == null && client || passPhrase == null)
-    {
-      if (client)
-      {
-        throw new KeyStoreException("Trust Store[" + (trustPath != null) + "] or Pass Phrase[" + (passPhrase != null)
-            + "] is not provided. [false] means it does not exist.");
-      }
-
-      throw new KeyStoreException("Key Store[" + (keyPath != null) + "] or Pass Phrase[" + (passPhrase != null)
-          + "] is not provided. [false] means it does not exist.");
-    }
-
-    char[] pass = passPhrase.toCharArray();
-
-    KeyManager[] keyManagers = null;
-    TrustManager[] trustManagers = null;
-
-    if (client)
-    {
-      // Initial key material(private key) for the client.
-      KeyStore ksTrust = KeyStore.getInstance(KeyStore.getDefaultType());
-
-      InputStream in = null;
-
-      try
-      {
-        in = new URL(trustPath).openStream();
-        ksTrust.load(in, pass);
-      }
-      finally
-      {
-        IOUtil.close(in);
-      }
-
-      // Initial the trust manager factory
-      TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-      tmf.init(ksTrust);
-
-      trustManagers = tmf.getTrustManagers();
-    }
-    else
-    {
-      // Initial key material (private key) for the server.
-      KeyStore ksKeys = KeyStore.getInstance(KeyStore.getDefaultType());
-      InputStream in = null;
-
-      try
-      {
-        in = new URL(keyPath).openStream();
-        ksKeys.load(in, pass);
-      }
-      finally
-      {
-        IOUtil.close(in);
-      }
-
-      // Initial the key manager factory.
-      KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-      kmf.init(ksKeys, pass);
-
-      keyManagers = kmf.getKeyManagers();
-    }
-
-    SSLContext sslContext = SSLContext.getInstance(PROTOCOL);
-    sslContext.init(keyManagers, trustManagers, null);
-
-    SSLEngine sslEngine = sslContext.createSSLEngine(host, port);
-    sslEngine.setUseClientMode(client);
-    return sslEngine;
-  }
-
-  public static synchronized int getHandShakeTimeOut()
-  {
-    return handShakeTimeOutVar;
-  }
-
-  public static synchronized int getHandShakeWaitTime()
-  {
-    return handShakeWaitTimeVar;
-  }
-}
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
+ *    Caspar De Groot (No Magic Asia Ltd.) - initial API and implementation
+ */
+package org.eclipse.net4j.tcp.ssl;
+
+import org.eclipse.net4j.internal.tcp.TCPAcceptorFactory;
+import org.eclipse.net4j.internal.tcp.TCPConnectorFactory;
+import org.eclipse.net4j.internal.tcp.ssl.SSLAcceptorFactory;
+import org.eclipse.net4j.internal.tcp.ssl.SSLConnectorFactory;
+import org.eclipse.net4j.internal.tcp.ssl.SSLProperties;
+import org.eclipse.net4j.tcp.ITCPAcceptor;
+import org.eclipse.net4j.tcp.ITCPConnector;
+import org.eclipse.net4j.tcp.TCPUtil;
+import org.eclipse.net4j.util.container.IManagedContainer;
+import org.eclipse.net4j.util.io.IOUtil;
+
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+
+/**
+ * A utility class with various static factory and convenience methods for SSL transport.
+ * 
+ * @author Teerawat Chaiyakijpichet (No Magic Asia Ltd.)
+ * @author Caspar De Groot (No Magic Asia Ltd.)
+ * @since 4.0
+ */
+public class SSLUtil
+{
+  /**
+   * The variable for SSL Engine
+   */
+  private static final String PROTOCOL = "TLS";
+
+  private static String configFile;
+
+  private static String keyPathVar;
+
+  private static String trustPathVar;
+
+  private static String passPhraseVar;
+
+  /**
+   * Default value of handshake timeout is 12 times.
+   */
+  private static int handShakeTimeOutVar = 12;
+
+  /**
+   * Default value of handshake wait time is 60 milliseconds.
+   */
+  private static int handShakeWaitTimeVar = 60;
+
+  public static synchronized void setDefaultSSLConfiguration(String keyPath, String trustPath, String passPhrase)
+  {
+    keyPathVar = keyPath;
+    trustPathVar = trustPath;
+    passPhraseVar = passPhrase;
+  }
+
+  public static synchronized void setDefaultSSLConfiguration(String keyPath, String trustPath, String passPhrase,
+      int handShakeTimeOut, int handShakeWaitTime)
+  {
+    setDefaultSSLConfiguration(keyPath, trustPath, passPhrase);
+
+    handShakeTimeOutVar = handShakeTimeOut;
+    handShakeWaitTimeVar = handShakeWaitTime;
+  }
+
+  public static synchronized void setSSLConfigurationFile(String file)
+  {
+    configFile = file;
+  }
+
+  public static synchronized void prepareContainer(IManagedContainer container)
+  {
+    TCPUtil.prepareContainer(container);
+
+    // Prepare SSL
+    container.registerFactory(new SSLAcceptorFactory());
+    container.registerFactory(new SSLConnectorFactory());
+  }
+
+  public static synchronized ITCPAcceptor getAcceptor(IManagedContainer container, String description)
+  {
+    return (ITCPAcceptor)container.getElement(TCPAcceptorFactory.PRODUCT_GROUP, SSLAcceptorFactory.TYPE, description);
+  }
+
+  public static synchronized ITCPConnector getConnector(IManagedContainer container, String description)
+  {
+    return (ITCPConnector)container
+        .getElement(TCPConnectorFactory.PRODUCT_GROUP, SSLConnectorFactory.TYPE, description);
+  }
+
+  public static synchronized SSLEngine createSSLEngine(boolean client, String host, int port)
+      throws NoSuchAlgorithmException, KeyStoreException, CertificateException, IOException, UnrecoverableKeyException,
+      KeyManagementException
+  {
+    // Get values from the system properties.
+    SSLProperties sslProperties = new SSLProperties();
+    String keyPath = sslProperties.getKeyPath();
+    String trustPath = sslProperties.getTrustPath();
+    String passPhrase = sslProperties.getPassPhrase();
+
+    if ((keyPath == null || trustPath == null || passPhrase == null) && configFile != null)
+    {
+      sslProperties.load(configFile);
+    }
+
+    // In case, the system properties does not have the key path property. It will load from local config file.
+    if (keyPath == null)
+    {
+      keyPath = sslProperties.getKeyPath();
+      if (keyPath == null)
+      {
+        keyPath = keyPathVar;
+      }
+    }
+
+    // In case, the system properties does not have the trust path property. It will load from local config file.
+    if (trustPath == null)
+    {
+      trustPath = sslProperties.getTrustPath();
+      if (trustPath == null)
+      {
+        trustPath = trustPathVar;
+      }
+    }
+
+    // In case, the system properties does not have the passphrase property. It will load from local config file.
+    if (passPhrase == null)
+    {
+      passPhrase = sslProperties.getPassPhrase();
+      if (passPhrase == null)
+      {
+        passPhrase = passPhraseVar;
+      }
+    }
+
+    // Handle assign the value of handshake timeout and handshake timewait from local properties or system properties by
+    // giving the value form system properties is high priority.
+    String value = sslProperties.getHandShakeTimeOut();
+    if (value != null)
+    {
+      handShakeTimeOutVar = Integer.parseInt(value);
+    }
+
+    value = sslProperties.getHandShakeWaitTime();
+    if (value != null)
+    {
+      handShakeWaitTimeVar = Integer.parseInt(value);
+    }
+
+    if (keyPath == null && !client || trustPath == null && client || passPhrase == null)
+    {
+      if (client)
+      {
+        throw new KeyStoreException("Trust Store[" + (trustPath != null) + "] or Pass Phrase[" + (passPhrase != null)
+            + "] is not provided. [false] means it does not exist.");
+      }
+
+      throw new KeyStoreException("Key Store[" + (keyPath != null) + "] or Pass Phrase[" + (passPhrase != null)
+          + "] is not provided. [false] means it does not exist.");
+    }
+
+    char[] pass = passPhrase.toCharArray();
+
+    KeyManager[] keyManagers = null;
+    TrustManager[] trustManagers = null;
+
+    if (client)
+    {
+      // Initial key material(private key) for the client.
+      KeyStore ksTrust = KeyStore.getInstance(KeyStore.getDefaultType());
+
+      InputStream in = null;
+
+      try
+      {
+        in = new URL(trustPath).openStream();
+        ksTrust.load(in, pass);
+      }
+      finally
+      {
+        IOUtil.close(in);
+      }
+
+      // Initial the trust manager factory
+      TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+      tmf.init(ksTrust);
+
+      trustManagers = tmf.getTrustManagers();
+    }
+    else
+    {
+      // Initial key material (private key) for the server.
+      KeyStore ksKeys = KeyStore.getInstance(KeyStore.getDefaultType());
+      InputStream in = null;
+
+      try
+      {
+        in = new URL(keyPath).openStream();
+        ksKeys.load(in, pass);
+      }
+      finally
+      {
+        IOUtil.close(in);
+      }
+
+      // Initial the key manager factory.
+      KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+      kmf.init(ksKeys, pass);
+
+      keyManagers = kmf.getKeyManagers();
+    }
+
+    SSLContext sslContext = SSLContext.getInstance(PROTOCOL);
+    sslContext.init(keyManagers, trustManagers, null);
+
+    SSLEngine sslEngine = sslContext.createSSLEngine(host, port);
+    sslEngine.setUseClientMode(client);
+    return sslEngine;
+  }
+
+  public static synchronized int getHandShakeTimeOut()
+  {
+    return handShakeTimeOutVar;
+  }
+
+  public static synchronized int getHandShakeWaitTime()
+  {
+    return handShakeWaitTimeVar;
+  }
+}