IAIK Moa CAdES added, cms verification not working

3 files changed, 28 insertions, 3 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
index 8a46219..478dcb4 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
@@ -260,7 +260,8 @@ public class SPSSFactoryImpl extends SPSSFactory {
     Date dateTime,
     InputStream cmsSignature,
     CMSDataObject dataObject,
-    String trustProfileID) {
+    String trustProfileID,
+    boolean pdf) {
     VerifyCMSSignatureRequestImpl verifyCMSSignatureRequest =
       new VerifyCMSSignatureRequestImpl();
     verifyCMSSignatureRequest.setDateTime(dateTime);
@@ -268,6 +269,7 @@ public class SPSSFactoryImpl extends SPSSFactory {
     verifyCMSSignatureRequest.setDataObject(dataObject);
     verifyCMSSignatureRequest.setTrustProfileId(trustProfileID);
     verifyCMSSignatureRequest.setSignatories(signatories);
+    verifyCMSSignatureRequest.setPDF(pdf);
     return verifyCMSSignatureRequest;
   }
 
@@ -321,13 +323,14 @@ public class SPSSFactoryImpl extends SPSSFactory {
   public VerifyCMSSignatureResponseElement createVerifyCMSSignatureResponseElement(
     SignerInfo signerInfo,
     CheckResult signatureCheck,
-    CheckResult certificateCheck) {
+    CheckResult certificateCheck, 
+    List adesResult) {
     VerifyCMSSignatureResponseElementImpl verifyCMSSignatureResponseElement =
       new VerifyCMSSignatureResponseElementImpl();
     verifyCMSSignatureResponseElement.setSignerInfo(signerInfo);
     verifyCMSSignatureResponseElement.setSignatureCheck(signatureCheck);
     verifyCMSSignatureResponseElement.setCertificateCheck(certificateCheck);
-    
+    verifyCMSSignatureResponseElement.setAdESFormResults(adesResult);
     return verifyCMSSignatureResponseElement;
   }
 
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java
index c759f5f..78d817b 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java
@@ -49,6 +49,8 @@ public class VerifyCMSSignatureRequestImpl
   private InputStream cmsSignature;
   /** The date for which to verify the signature. */
   private Date dateTime;
+  
+  private boolean pdf = false;
 
   /**
    * Sets the indexes of the signatories whose signature should be verified.
@@ -114,4 +116,12 @@ public class VerifyCMSSignatureRequestImpl
     return trustProfileId;
   }
 
+  public void setPDF(boolean value) {
+	  this.pdf = value;
+  }
+  
+  public boolean isPDF() {
+	  return this.pdf;
+  }
+
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java
index f258b3b..3d6b72a 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java
@@ -24,6 +24,8 @@
 
 package at.gv.egovernment.moa.spss.api.impl;
 
+import java.util.List;
+
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement;
 import at.gv.egovernment.moa.spss.api.common.CheckResult;
 import at.gv.egovernment.moa.spss.api.common.SignerInfo;
@@ -44,6 +46,8 @@ public class VerifyCMSSignatureResponseElementImpl
   /** Information about the certificate check. */
   private CheckResult certificateCheck;
   
+  private List adesResults = null;
+  
   /**
    * Sets a SignerInfo element according to CMS.
    * 
@@ -82,5 +86,13 @@ public class VerifyCMSSignatureResponseElementImpl
   public CheckResult getCertificateCheck() {
     return certificateCheck;
   }
+
+  public void setAdESFormResults(List adesResults) {
+	this.adesResults = adesResults;
+  }
+  
+  public List getAdESFormResults() {
+	return adesResults;
+  }
   
 }