3 files changed, 11 insertions, 6 deletions
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
index 8fe31c5..5daf1a6 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
@@ -41,7 +41,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.bind.DatatypeConverter;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.w3c.dom.Attr;
@@ -71,6 +70,7 @@ import iaik.utils.RFC2253NameParser;
 import iaik.utils.RFC2253NameParserException;
 import iaik.xml.crypto.utils.URI;
 import iaik.xml.crypto.utils.URIException;
+import jakarta.xml.bind.DatatypeConverter;
 
 /**
  * A class that builds configuration data from a DOM based representation.
@@ -1562,10 +1562,12 @@ public class ConfigurationPartsBuilder {
 
   public boolean getAutoEEAddCertificates() {
     final String autoAdd = getElementValue(getConfigElem(), AUTO_ADD_EE_CERTIFICATES_XPATH_, null);
-    if (autoAdd != null) {
+    if (autoAdd != null) {      
       return Boolean.valueOf(autoAdd).booleanValue();
+      
     } else {
       return false;
+      
     }
 
   }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
index 64bd066..4596109 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
@@ -47,6 +47,8 @@ import at.gv.egovernment.moaspss.util.DOMUtils;
 import at.gv.egovernment.moaspss.util.MiscUtil;
 import iaik.asn1.structures.Name;
 import iaik.pki.revocation.RevocationSourceTypes;
+import iaik.pki.utils.NameUtils;
+import iaik.pki.utils.UtilsException;
 import iaik.utils.RFC2253NameParser;
 import iaik.utils.RFC2253NameParserException;
 
@@ -724,16 +726,14 @@ public class ConfigurationProvider {
    */
   public Set getDistributionPoints(X509Certificate cert) {
     try {
-      final RFC2253NameParser nameParser =
-          new RFC2253NameParser(cert.getIssuerDN().toString());
-      final String caIssuerDN = nameParser.parse().getName();
+      final String caIssuerDN =  NameUtils.getNormalizedName((Name)cert.getIssuerDN());
       final Set dps = (Set) distributionPoints.get(caIssuerDN);
 
       if (dps == null) {
         return Collections.EMPTY_SET;
       }
       return dps;
-    } catch (final RFC2253NameParserException e) {
+    } catch (final UtilsException e) {
       return Collections.EMPTY_SET;
     }
   }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java
index 0032dc6..a53bce8 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java
@@ -211,12 +211,15 @@ public class PKIProfileImpl implements PKIProfile {
     if (config.getAutoAddCertificates()) {
       if (config.getAutoAddEECertificates()) {
         return PKIProfile.AUTO_ADD_ENABLE;
+        
       } else {
         return PKIProfile.AUTO_ADD_EE_DISABLE;
+        
       }
 
     } else {
       return PKIProfile.AUTO_ADD_DISABLE;
+      
     }
 
   }