add PAdES flag and update IAIK libs

2 files changed, 13 insertions, 3 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java
index 2dc047a..a465049 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java
@@ -61,6 +61,7 @@ public class CMSSignatureCreationProfileImpl
   private boolean includeData;
   /** Digest Method algorithm  */
   private String digestMethod;
+  private boolean isPAdESConform;
   
   
   /**
@@ -77,13 +78,15 @@ public class CMSSignatureCreationProfileImpl
     List signedProperties,
     boolean securityLayerConform,
     boolean includeData,
-    String mimeType) {
+    String mimeType,
+    boolean isPAdESConform) {
 	  this.keySet = keySet;
 	  this.signedProperties = signedProperties;
 	  this.securityLayerConform = securityLayerConform;
 	  this.includeData = includeData;
 	  this.mimeType = mimeType;
 	  this.digestMethod = digestMethod;
+	  this.isPAdESConform = isPAdESConform;
 
   }
 
@@ -246,4 +249,10 @@ public class CMSSignatureCreationProfileImpl
 	return this.includeData;
   }
 
+
+@Override
+public boolean isPAdESConform() {
+	return this.isPAdESConform;
+}
+
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java
index 753d769..4050ebc 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java
@@ -181,7 +181,7 @@ public class CMSSignatureCreationInvoker {
 		  CMSDataObject dataobject = dataObjectInfo.getDataObject();
 		  MetaInfo metainfo = dataobject.getMetaInfo();
 		  
-		  /*TODO: does not set SigningTime in IAIK-MOA request or any other
+		  /*TODO: do not set SigningTime in IAIK-MOA request or any other
 		   * API method/parameter when IAIK-MOA API is updated.
 		   * Maybe also update mimetype solution below
 		   */
@@ -245,7 +245,8 @@ public class CMSSignatureCreationInvoker {
 				  signedProperties,
 				  isSecurityLayerConform, 
 				  includeData, 
-				  mimetype);
+				  mimetype,
+				  isPAdESConformRequired);
 		  
 		  // create CMSSignature from the CMSSignatureCreationModule
 		  // build the additionalSignedProperties