remove MOA-ID specific certStore directory.

From now, MOA-ID always use the MOA-SPSS certStore directory for chain building

1 files changed, 10 insertions, 6 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
index d2a099c69..4ecda435d 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
@@ -61,7 +61,7 @@ import javax.net.ssl.TrustManager;
 
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.KeyStoreUtils;
-import iaik.pki.PKIConfiguration;
+import iaik.pki.DefaultPKIConfiguration;
 import iaik.pki.PKIException;
 import iaik.pki.PKIFactory;
 //import iaik.pki.jsse.IAIKX509TrustManager;
@@ -218,12 +218,16 @@ public class SSLUtils {
     boolean checkRevocation, String[] revocationMethodOrder) 
     throws SSLConfigurationException, PKIException, IOException, GeneralSecurityException {
 
-    PKIConfiguration cfg = null;
-    if (! PKIFactory.getInstance().isAlreadyConfigured())
-      cfg = new PKIConfigurationImpl(certStoreRootDirParam, chainingMode);
-    
-    PKIProfileImpl profile = new PKIProfileImpl(trustStoreURL, checkRevocation);
+	DefaultPKIConfiguration cfg = null;
+    if (! PKIFactory.getInstance().isAlreadyConfigured()) {
+    	CertStoreConfigurationImpl certStoreConf = new CertStoreConfigurationImpl(certStoreRootDirParam);
+    	cfg = new DefaultPKIConfiguration(certStoreConf.getParameters());
+    	cfg.setChainingMode(chainingMode);
+    	Logger.info("Set-up PKI module configuration ... ");
+    	
+    }
     
+    PKIProfileImpl profile = new PKIProfileImpl(trustStoreURL, checkRevocation);    
     profile.setPreferredServiceOrder(revocationMethodOrder);
     
     // This call fixes a bug occuring when PKIConfiguration is