1 files changed, 25 insertions, 3 deletions
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
index d48b394ef..755ca82b6 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
@@ -60,6 +60,8 @@ import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResultInfo;
 import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult;
 import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResultInfo;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
+import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
+import at.gv.egovernment.moa.spss.server.config.TrustProfile;
 import at.gv.egovernment.moa.util.CollectionUtils;
 import at.gv.egovernment.moa.util.DOMUtils;
 import at.gv.egovernment.moa.util.NodeListAdapter;
@@ -123,13 +125,20 @@ public class VerifyXMLSignatureResponseBuilder {
    * @param transformsSignatureManifestCheck The overall result for the signature 
    *        manifest check.
    * @param certificateCheck The overall result for the certificate check.
+   * @param checkQCFromTSL <code>true</code>, if the TSL check verifies the 
+   * 		certificate as qualified, otherwise <code>false</code>.
+   * @param checkSSCDFromTSL <code>true</code>, if the TSL check verifies the 
+   * 		signature based on a SSDC, otherwise <code>false</code>.
    * @throws MOAApplicationException An error occurred adding the result.
    */
   public void setResult(
     XMLSignatureVerificationResult result,
     XMLSignatureVerificationProfile profile,
     ReferencesCheckResult transformsSignatureManifestCheck,
-    CheckResult certificateCheck)
+    CheckResult certificateCheck, 
+    boolean checkQCFromTSL,
+    boolean checkSSCDFromTSL,
+    boolean isTSLEnabledTrustprofile)
     throws MOAApplicationException {
 
     CertificateValidationResult certResult =
@@ -141,13 +150,26 @@ public class VerifyXMLSignatureResponseBuilder {
     int[] failedReferences;
     Iterator iter;
 
+    boolean qualifiedCertificate = false;
+    
+    // verify qualified certificate checks (certificate or TSL)
+    if (isTSLEnabledTrustprofile) {
+    	// take TSL result
+    	qualifiedCertificate = checkQCFromTSL;  
+    }
+    else {
+    	// take result from certificate
+    	qualifiedCertificate = certResult.isQualifiedCertificate();
+    }
+    
     // create the SignerInfo;
     signerInfo =
       factory.createSignerInfo(
         (X509Certificate) certResult.getCertificateChain().get(0),
-        certResult.isQualifiedCertificate(),
+        qualifiedCertificate,
         certResult.isPublicAuthorityCertificate(),
-        certResult.getPublicAuthorityID());
+        certResult.getPublicAuthorityID(),
+        checkSSCDFromTSL);
 
     // Create HashInputData Content objects
     referenceDataList = result.getReferenceDataList();