git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@96 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
index d67bb90..b95f61b 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
@@ -797,7 +797,9 @@ public class SignatureObject implements Serializable
 

     String productName = response_properties.getProperty("productName");

     logger_.debug("productName = " + productName);

-    if (!productName.equals("trustDeskbasic"))

+//  if (!productName.equals("trustDeskbasic"))

+    // modified by tknall

+    if (!productName.startsWith("trustDeskbasic"))

     {

       final String msg = "The BKU environment " + productName + " is not trustDeskbasic and therefore the productVersion cannot be decided.";

       logger_.error(msg);

@@ -1013,6 +1015,14 @@ public class SignatureObject implements Serializable
       {

         // use explicit method for normalization 

         issuer = normalizeIssuer(issuer);

+        /* this block may be used to enhance normalization (tknall)

+		  try {

+			  Name issuerName = new RFC2253NameParser(issuer).parse();

+			  issuer = issuerName.getRFC2253String();

+		  } catch (RFC2253NameParserException e) {

+			  logger_.error(e);

+		  }

+		  */

         // added the ("UTF-8")

         issuer = CodingHelper.encodeBase64(CodingHelper.buildDigest(issuer.getBytes("UTF-8")));

         issuer = issuer.replaceAll("/", "_");