0004627: Hardcoded KeyManagerFactory algorithm (sunX509). Symmetric

doesn't work for IBM JRE
JumpMind · Nov 6, 2020 · df963fa · df963fa
1 parent 7740830
commit df963fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/symmetric-util/src/main/java/org/jumpmind/security/SecurityConstants.java b/symmetric-util/src/main/java/org/jumpmind/security/SecurityConstants.java
@@ -38,6 +38,8 @@ public class SecurityConstants {
 
     public static final String SYSPROP_SSL_IGNORE_CIPHERS = "symmetric.ssl.ignore.ciphers";
 
+    public static final String SYSPROP_KEY_MANAGER_FACTORY_ALGORITHM = "sym.key.manager.factory.algorithm";
+
     public final static String CLASS_NAME_SECURITY_SERVICE = "security.service.class.name";
 
     public static final String PREFIX_ENC = "enc:";

diff --git a/symmetric-util/src/main/java/org/jumpmind/security/SecurityService.java b/symmetric-util/src/main/java/org/jumpmind/security/SecurityService.java
@@ -100,7 +100,7 @@ public KeyStore getKeyStore() {
     public KeyManagerFactory getKeyManagerFactory() {
         KeyManagerFactory keyManagerFactory;
         try {
-            keyManagerFactory = KeyManagerFactory.getInstance("SunX509");
+            keyManagerFactory = KeyManagerFactory.getInstance(getKeyManagerFactoryAlgorithm());
             keyManagerFactory.init(getKeyStore(), getKeyStorePassword().toCharArray());
         } catch (RuntimeException e) {
             throw e;
@@ -278,6 +278,10 @@ protected String getKeyStorePassword() {
         password = (password != null) ? password : SecurityConstants.KEYSTORE_PASSWORD;
         return password;
     }
+
+    protected String getKeyManagerFactoryAlgorithm() {
+        return System.getProperty(SecurityConstants.SYSPROP_KEY_MANAGER_FACTORY_ALGORITHM, "SunX509");
+    }
 
     protected SecretKey getSecretKey() throws Exception {
         String password = getKeyStorePassword();