1 files changed, 57 insertions, 12 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
index 3472419..55e9ad7 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
@@ -44,6 +44,8 @@ import at.gv.egovernment.moa.spss.util.SecProviderUtils;
 import at.gv.egovernment.moaspss.logging.LogMsg;
 import at.gv.egovernment.moaspss.logging.Logger;
 import iaik.logging.LogFactory;
+import iaik.pki.PKIException;
+import iaik.pki.PKIFactory;
 import iaik.pki.store.revocation.RevocationFactory;
 import iaik.pki.store.revocation.RevocationSourceStore;
 import iaik.pki.store.truststore.TrustStoreFactory;
@@ -52,6 +54,8 @@ import iaik.server.Configurator;
 import iaik.server.modules.keys.KeyEntryID;
 import iaik.server.modules.keys.KeyModule;
 import iaik.server.modules.keys.KeyModuleFactory;
+import iaik.servertools.PublicAuthorityIdentifier;
+import iaik.x509.X509Extensions;
 
 /**
  * A class responsible for configuring the IAIK MOA modules.
@@ -59,7 +63,7 @@ import iaik.server.modules.keys.KeyModuleFactory;
  * @author Patrick Peck
  * @version $Id$
  */
-public class IaikConfigurator {
+public class IaikConfigurator extends Configurator {
 
   private static final org.slf4j.Logger logger = LoggerFactory.getLogger(IaikConfigurator.class);
 
@@ -89,17 +93,12 @@ public class IaikConfigurator {
 
       LogFactory.configure(configData.getLoggerConfig());
 
-      try {
-        iaik.pki.Configurator.initCommon(configData.getLoggerConfig(),
-            transId);
-        // SecProviderUtils.dumpSecProviders("initCommon");
-        final String certStoreRoot = moaConfig.getCertStoreLocation();
-        CertStoreConverter.convert(certStoreRoot, transId);
-      } finally {
-        // Security.removeProvider(ECCelerate.getInstance().getName());
-      }
-
-      Configurator.init(configData, transId);
+      
+      // initialize PKI commons
+      initializePkiCommons(moaConfig, transId, configData);
+      
+      // initialze IAIK MOA
+      customIaikInit(configData, transId);
 
       SecProviderUtils.dumpSecProviders("Fully configured!");
 
@@ -125,6 +124,52 @@ public class IaikConfigurator {
     }
   }
 
+  public static void customIaikInit(ConfigurationData config, TransactionId transactionId) throws ConfigurationException, iaik.server.ConfigurationException {
+    if (config == null) {
+      throw new NullPointerException("Config data must not be null");
+    } else {
+      logger.trace("Setting up IAIK-MOA crypto backend ... ");
+      
+      initXSect(LogFactory.getLog("init-xsect"), transactionId);            
+      X509Extensions.register(PublicAuthorityIdentifier.oid, PublicAuthorityIdentifier.class);
+      
+      // initialize PKI module only if it is not done yet
+      if (!PKIFactory.getInstance().isAlreadyConfigured()) {
+        initPkiModule(config.getPKIConfiguration(), transactionId);
+        
+      } else {
+        logger.trace("IAIK PKI-module is still configurated");
+        
+      }
+      
+      
+      initCryptoModule(config.getCryptoModuleConfigurations(), transactionId);
+      initKeyModule(config.getKeyModuleConfigurations(), transactionId);
+    }
+  }
+  
+  
+  private static void initializePkiCommons(ConfigurationProvider moaConfig, TransactionId transId, ConfigurationData configData) throws PKIException {
+    if (!iaik.pki.Configurator.isInitialized()) {
+      logger.info("Initializing IAIK PKI-Commons ... ");
+      try {
+        iaik.pki.Configurator.initCommon(configData.getLoggerConfig(),
+            transId);
+        
+        final String certStoreRoot = moaConfig.getCertStoreLocation();
+        CertStoreConverter.convert(certStoreRoot, transId);
+        
+      } finally {
+        // Security.removeProvider(ECCelerate.getInstance().getName());
+      }      
+      
+    } else {
+      logger.trace("IAIK PKI-Commons already initialized");
+      
+    }
+        
+  }
+
   private static void logException(Throwable e) {
     final StringWriter out = new StringWriter();
     final PrintWriter writer = new PrintWriter(out);