3 files changed, 14 insertions, 3 deletions
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
index 6e4389e1d..a228a0db8 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
@@ -118,7 +118,8 @@ class ResponseBuilderUtils {
     X509Certificate cert,
     boolean isQualified,
     boolean isPublicAuthority,
-    String publicAuthorityID)
+    String publicAuthorityID,
+    boolean isSSCD)
     throws MOAApplicationException {
 
     Element signerInfoElem = response.createElementNS(MOA_NS_URI, "SignerInfo");
@@ -140,6 +141,10 @@ class ResponseBuilderUtils {
       isQualified
         ? response.createElementNS(MOA_NS_URI, "QualifiedCertificate")
         : null;
+    Element sscdElem =
+            isSSCD
+              ? response.createElementNS(MOA_NS_URI, "SecureSignatureCreationDevice")
+              : null;
     Element publicAuthorityElem =
       isPublicAuthority
         ? response.createElementNS(MOA_NS_URI, "PublicAuthority")
@@ -186,6 +191,9 @@ class ResponseBuilderUtils {
         publicAuthorityElem.appendChild(codeElem);
       }
     }
+    if (isSSCD) {
+        x509DataElem.appendChild(sscdElem);
+      }
     signerInfoElem.appendChild(x509DataElem);
     root.appendChild(signerInfoElem);
   }
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java
index 2fee98fdd..1971096a8 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java
@@ -99,13 +99,15 @@ public class VerifyCMSSignatureResponseBuilder {
     CheckResult signatureCheck = responseElement.getSignatureCheck();
     CheckResult certCheck = responseElement.getCertificateCheck();
     
+    // TODO CMS TSL check
     ResponseBuilderUtils.addSignerInfo(
       responseDoc,
       responseElem,
       signerInfo.getSignerCertificate(),
       signerInfo.isQualifiedCertificate(),
       signerInfo.isPublicAuthority(),
-      signerInfo.getPublicAuhtorityID());
+      signerInfo.getPublicAuhtorityID(),
+      false);
 
     ResponseBuilderUtils.addCodeInfoElement(
       responseDoc,
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
index d028ef5fb..0d3e0c18e 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
@@ -97,7 +97,8 @@ public class VerifyXMLSignatureResponseBuilder {
       response.getSignerInfo().getSignerCertificate(),
       response.getSignerInfo().isQualifiedCertificate(),
       response.getSignerInfo().isPublicAuthority(),
-      response.getSignerInfo().getPublicAuhtorityID());
+      response.getSignerInfo().getPublicAuhtorityID(),
+      response.getSignerInfo().isSSCD());
 
     // add HashInputData elements
     responseData = response.getHashInputDatas();