1 files changed, 16 insertions, 18 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
index 01f13408b0..c9ff180c54 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
@@ -20,18 +20,17 @@
  */
 package org.apache.qpid.ssl;
 
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
+import org.apache.qpid.transport.network.security.ssl.QpidClientX509KeyManager;
+import org.apache.qpid.transport.network.security.ssl.SSLUtil;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
-
-import org.apache.qpid.transport.network.security.ssl.QpidClientX509KeyManager;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
 
 /**
  * Factory used to create SSLContexts. SSL needs to be configured
@@ -42,7 +41,6 @@ public class SSLContextFactory
 {
     public static final String JAVA_KEY_STORE_CODE = "JKS";
     public static final String TRANSPORT_LAYER_SECURITY_CODE = "TLS";
-    public static final String KEY_STORE_CERTIFICATE_TYPE = "SunX509";
 
     private SSLContextFactory()
     {
@@ -50,28 +48,28 @@ public class SSLContextFactory
     }
 
     public static SSLContext buildServerContext(final String keyStorePath,
-            final String keyStorePassword, final String keyStoreCertType)
+            final String keyStorePassword, final String keyManagerFactoryAlgorithm)
             throws GeneralSecurityException, IOException
     {
         return buildContext(null, null, null, keyStorePath, keyStorePassword,
-                keyStoreCertType, null);
+                keyManagerFactoryAlgorithm, null);
     }
 
     public static SSLContext buildClientContext(final String trustStorePath,
-            final String trustStorePassword, final String trustStoreCertType,
+            final String trustStorePassword, final String trustManagerFactoryAlgorithm,
             final String keyStorePath, final String keyStorePassword,
-            final String keyStoreCertType, final String certAlias)
+            final String keyManagerFactoryAlgorithm, final String certAlias)
             throws GeneralSecurityException, IOException
     {
         return buildContext(trustStorePath, trustStorePassword,
-                trustStoreCertType, keyStorePath, keyStorePassword,
-                keyStoreCertType, certAlias);
+                trustManagerFactoryAlgorithm, keyStorePath, keyStorePassword,
+                keyManagerFactoryAlgorithm, certAlias);
     }
     
     private static SSLContext buildContext(final String trustStorePath,
-            final String trustStorePassword, final String trustStoreCertType,
+            final String trustStorePassword, final String trustManagerFactoryAlgorithm,
             final String keyStorePath, final String keyStorePassword,
-            final String keyStoreCertType, final String certAlias)
+            final String keyManagerFactoryAlgorithm, final String certAlias)
             throws GeneralSecurityException, IOException
     {
         // Initialize the SSLContext to work with our key managers.
@@ -86,7 +84,7 @@ public class SSLContextFactory
             final KeyStore ts = SSLUtil.getInitializedKeyStore(trustStorePath,
                     trustStorePassword);
             final TrustManagerFactory tmf = TrustManagerFactory
-                    .getInstance(trustStoreCertType);
+                    .getInstance(trustManagerFactoryAlgorithm);
             tmf.init(ts);
 
             trustManagers = tmf.getTrustManagers();
@@ -102,7 +100,7 @@ public class SSLContextFactory
             {
                 keyManagers = new KeyManager[] { new QpidClientX509KeyManager(
                         certAlias, keyStorePath, keyStorePassword,
-                        keyStoreCertType) };
+                        keyManagerFactoryAlgorithm) };
             }
             else
             {
@@ -112,7 +110,7 @@ public class SSLContextFactory
                 char[] keyStoreCharPassword = keyStorePassword == null ? null : keyStorePassword.toCharArray();
                 // Set up key manager factory to use our key store
                 final KeyManagerFactory kmf = KeyManagerFactory
-                        .getInstance(keyStoreCertType);
+                        .getInstance(keyManagerFactoryAlgorithm);
                 kmf.init(ks, keyStoreCharPassword);
                 keyManagers = kmf.getKeyManagers();
             }