Modified to use javax.net classes instead of old deprecated classes . JM-387

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@2774 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/net/SSLJiveKeyManagerFactory.java

@@ -11,9 +11,6 @@
 
 package org.jivesoftware.messenger.net;
 
-import com.sun.net.ssl.KeyManager;
-import com.sun.net.ssl.KeyManagerFactory;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.KeyStore;
@@ -22,6 +19,11 @@ import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+
+import org.jivesoftware.util.Log;
+
 /**
  * A custom KeyManagerFactory that creates a key manager list using the
  * default key manager or a standard keystore as specified in jive_config.xml.
@@ -75,4 +77,34 @@ public class SSLJiveKeyManagerFactory {
         }
         return keyManagers;
     }
+    public static KeyManager[] getKeyManagers(KeyStore keystore, String keypass) {
+		KeyManager[] keyManagers;
+		try {
+			if (keystore == null) {
+				keyManagers = null;
+			} else {
+				KeyManagerFactory keyFactory = KeyManagerFactory
+						.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+				if (keypass == null) {
+					keypass = SSLConfig.getKeyPassword();
+				}
+
+				keyFactory.init(keystore, keypass.toCharArray());
+				keyManagers = keyFactory.getKeyManagers();
+			}
+		} catch (KeyStoreException e) {
+			keyManagers = null;
+			Log.error("SSLJiveKeyManagerFactory startup problem.\n" +
+                    "  the keystore is corrupt", e);
+		} catch (NoSuchAlgorithmException e) {
+			keyManagers = null;
+			Log.error("SSLJiveKeyManagerFactory startup problem.\n" +
+                    "  the keystore type doesn't exist (not provided or configured with your JVM)", e);
+		} catch (UnrecoverableKeyException e) {
+			keyManagers = null;
+			Log.error("SSLJiveKeyManagerFactory startup problem.\n" +
+                    "  the keystore could not be opened (typically the password is bad)", e);
+		} 
+		return keyManagers;
+	}
 }

src/java/org/jivesoftware/messenger/net/SSLJiveTrustManagerFactory.java

@@ -11,9 +11,6 @@
 
 package org.jivesoftware.messenger.net;
 
-import com.sun.net.ssl.TrustManager;
-import com.sun.net.ssl.TrustManagerFactory;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.KeyStore;
@@ -21,6 +18,11 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+
+import org.jivesoftware.util.Log;
+
 /**
  * A custom TrustManagerFactory that creates a trust manager list using the
  * default trust manager or a standard keystore as specified in jive_config.xml.
@@ -73,4 +75,33 @@ public class SSLJiveTrustManagerFactory {
         }
         return trustManagers;
     }
+    
+    public static TrustManager[] getTrustManagers(KeyStore truststore,
+			String trustpass) {
+		TrustManager[] trustManagers;
+		try {
+			if (truststore == null) {
+				trustManagers = null;
+			} else {
+				TrustManagerFactory trustFactory = TrustManagerFactory
+						.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+				if (trustpass == null) {
+					trustpass = SSLConfig.getTrustPassword();
+				}
+
+				trustFactory.init(truststore);
+
+				trustManagers = trustFactory.getTrustManagers();
+			}
+		} catch (KeyStoreException e) {
+			trustManagers = null;
+			Log.error("SSLJiveTrustManagerFactory startup problem.\n" +
+                    "  the keystore is corrupt", e);
+		} catch (NoSuchAlgorithmException e) {
+			trustManagers = null;
+			Log.error("SSLJiveTrustManagerFactory startup problem.\n" +
+                    "  the keystore type doesn't exist (not provided or configured with your JVM)", e);
+		}
+		return trustManagers;
+	}
 }