From 00e4e0cbaf7fe6b2ecb08011995f00e503981911 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 13 Feb 2018 11:27:02 +0100
Subject: add infos about signature and hash algorithms into responses

---
 .../asic/xmlbind/VerifyASICSignatureResponseBuilder.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind')

diff --git a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java
index 50cd261..67d8b05 100644
--- a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java
+++ b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java
@@ -25,6 +25,7 @@
 package at.gv.egiz.asic.xmlbind;
 
 import at.gv.egiz.asic.api.ASiCVerificationResult;
+import at.gv.egiz.asic.impl.AsicSignedFilesContainer;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.MOASystemException;
@@ -37,6 +38,8 @@ import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureResponseBuilder;
 import at.gv.egovernment.moa.spss.api.xmlverify.AdESFormResults;
 import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureResponseBuilder;
 import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.MiscUtil;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -96,11 +99,14 @@ public class VerifyASICSignatureResponseBuilder {
             throws MOAException {
         Element asiCSignatureResultElem = responseDoc.createElementNS(Constants.MOA_NS_URI, "ASiCSignatureResult");
 
-        Iterator<String> signedFiles = aSiCVerificationResult.getSignedFiles().iterator();
+        Iterator<AsicSignedFilesContainer> signedFiles = aSiCVerificationResult.getSignedFiles().iterator();
         while (signedFiles.hasNext()) {
-            String signedFile = signedFiles.next();
+            AsicSignedFilesContainer signedFile = signedFiles.next();
             Element signedFilesElem = responseDoc.createElementNS(Constants.MOA_NS_URI, "signedFiles");
-            signedFilesElem.setTextContent(signedFile);
+            signedFilesElem.setTextContent(signedFile.getUri());
+            if (MiscUtil.isNotEmpty(signedFile.getHashAlg()))
+            	signedFilesElem.setAttribute("hashAlgorithm", signedFile.getHashAlg());
+            
             asiCSignatureResultElem.appendChild(signedFilesElem);
         }
 
@@ -141,6 +147,10 @@ public class VerifyASICSignatureResponseBuilder {
       signerInfo.getIssuerCountryCode(),
       signerInfo.getTslInfos());
 
+    ResponseBuilderUtils.addSignatureAlgorithm(responseDoc,
+            responseElem,
+            responseElement.getSignatureAlgorithm());
+    
     ResponseBuilderUtils.addCodeInfoElement(
       responseDoc,
       responseElem,
-- 
cgit v1.2.3