1 files changed, 9 insertions, 1 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);
   }