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

---
 .../invoke/VerifyCMSSignatureResponseBuilder.java   | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java')

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
index f4121b0..22bae71 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
@@ -83,7 +83,7 @@ public class VerifyCMSSignatureResponseBuilder {
  * @throws MOAException 
    */
   public void addResult(CMSSignatureVerificationResult result, TrustProfile trustProfile, boolean checkQC, boolean qcSourceTSL, boolean checkSSCD, boolean sscdSourceTSL, String issuerCountryCode, List adesResults, 
-		  ExtendedCertificateCheckResult extendedCertificateCheckResult, TslInfos tslInfos)
+		  ExtendedCertificateCheckResult extendedCertificateCheckResult, TslInfos tslInfos, boolean extendedVerification)
     throws MOAException {
 	  
     CertificateValidationResult certResult =
@@ -99,6 +99,11 @@ public class VerifyCMSSignatureResponseBuilder {
 
     boolean qualifiedCertificate = checkQC;
     
+  //add signature algorithm name in case of extended validation
+    String sigAlgName = null;
+    if (extendedVerification)
+    	sigAlgName = result.getSignatureAlgorithmName();
+    
     // add SignerInfo element
     signerInfo =
       factory.createSignerInfo(
@@ -126,7 +131,8 @@ public class VerifyCMSSignatureResponseBuilder {
         signatureCheck,
         certificateCheck, 
         adesResults, 
-        extendedCertificateCheckResult);
+        extendedCertificateCheckResult,
+        sigAlgName);
     responseElements.add(responseElement);
   }
   
@@ -144,7 +150,7 @@ public class VerifyCMSSignatureResponseBuilder {
  * @throws MOAException 
    */
   public void addResult(PDFSignatureVerificationResult result, TrustProfile trustProfile, boolean checkQC, boolean qcSourceTSL, boolean checkSSCD, boolean sscdSourceTSL, String issuerCountryCode, List adesResults, 
-		  ExtendedCertificateCheckResult extendedCertificateCheckResult, TslInfos tslInfos)
+		  ExtendedCertificateCheckResult extendedCertificateCheckResult, TslInfos tslInfos, boolean extendedVerification)
     throws MOAException {
 	  
     CertificateValidationResult certResult =
@@ -159,6 +165,12 @@ public class VerifyCMSSignatureResponseBuilder {
 
     boolean qualifiedCertificate = checkQC;
     
+    //add signature algorithm name in case of extended validation
+    String sigAlgName = null;
+    if (extendedVerification)
+    	sigAlgName = result.getSignatureAlgorithmName();
+    
+    
     //set code 99 if not certcheckresult exists
     int certificateCheckCode = 99;
     if (certResult != null) {
@@ -192,7 +204,8 @@ public class VerifyCMSSignatureResponseBuilder {
         signatureCheck,
         certificateCheck, 
         adesResults, 
-        extendedCertificateCheckResult);
+        extendedCertificateCheckResult,
+        sigAlgName);
     responseElements.add(responseElement);
   }
 
-- 
cgit v1.2.3