add PAdES flag and update IAIK libs

12 files changed, 19 insertions, 4 deletions

diff --git a/moaSig/libs/iaik_eccelerate-4.02.jar b/moaSig/libs/iaik_eccelerate-4.02.jar
new file mode 100644
index 0000000..9727ab3
--- /dev/null
+++ b/moaSig/libs/iaik_eccelerate-4.02.jar
diff --git a/moaSig/libs/iaik_eccelerate.jar b/moaSig/libs/iaik_eccelerate.jar
deleted file mode 100644
index 0ec3110..0000000
--- a/moaSig/libs/iaik_eccelerate.jar
+++ /dev/null
diff --git a/moaSig/libs/iaik_eccelerate_addon-4.02.jar b/moaSig/libs/iaik_eccelerate_addon-4.02.jar
new file mode 100644
index 0000000..75446fc
--- /dev/null
+++ b/moaSig/libs/iaik_eccelerate_addon-4.02.jar
diff --git a/moaSig/libs/iaik_eccelerate_addon.jar b/moaSig/libs/iaik_eccelerate_addon.jar
deleted file mode 100644
index bd57ff2..0000000
--- a/moaSig/libs/iaik_eccelerate_addon.jar
+++ /dev/null
diff --git a/moaSig/libs/iaik_eccelerate_cms-4.02.jar b/moaSig/libs/iaik_eccelerate_cms-4.02.jar
new file mode 100644
index 0000000..b788f05
--- /dev/null
+++ b/moaSig/libs/iaik_eccelerate_cms-4.02.jar
diff --git a/moaSig/libs/iaik_eccelerate_cms.jar b/moaSig/libs/iaik_eccelerate_cms.jar
deleted file mode 100644
index 3c9ac83..0000000
--- a/moaSig/libs/iaik_eccelerate_cms.jar
+++ /dev/null
diff --git a/moaSig/libs/iaik_jce_full.jar b/moaSig/libs/iaik_jce_full-5.5_MOA.jar
index 736981a..4f0e903 100644
--- a/moaSig/libs/iaik_jce_full.jar
+++ b/moaSig/libs/iaik_jce_full-5.5_MOA.jar
diff --git a/moaSig/libs/iaik_moa-2.04.jar b/moaSig/libs/iaik_moa-2.05.jar
index 98ee49d..51dc3f0 100644
--- a/moaSig/libs/iaik_moa-2.04.jar
+++ b/moaSig/libs/iaik_moa-2.05.jar
diff --git a/moaSig/libs/iaik_pki_module-1.02.jar b/moaSig/libs/iaik_pki_module-1.04_moa.jar
index cc32a74..e9bec14 100644
--- a/moaSig/libs/iaik_pki_module-1.02.jar
+++ b/moaSig/libs/iaik_pki_module-1.04_moa.jar
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
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
index 4effec6..839d8ba 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
@@ -116,6 +116,7 @@ public class SignatureCreationService {
 		  Logger.trace(">>> creating Signature");
 	      // invoke the core logic
 	      //responseObj = PDFASInvoker.getInstance().createPDFSignature(requestObj, context.getTransactionID());
+		  		  
 		  Logger.trace("<<< created Signature");
 
 		  Logger.trace(">>> building Response");
@@ -127,7 +128,11 @@ public class SignatureCreationService {
 	      context.setResponse(response[0]);
 		  Logger.trace("---- Leaving SignatureCreationService");
 		  
+		  //TODO: remove if PDF signatures are supported
+		  throw new MOASystemException("Create PAdES signatures is currently NOT supported by MOA-SIG", null);
 
+		  //return response;
+		  
 	    } catch (MOAException e) {
 	      AxisFault fault = AxisFault.makeFault(e);
 	      fault.setFaultDetail(new Element[] { e.toErrorResponse()});
@@ -143,7 +148,7 @@ public class SignatureCreationService {
 	      throw fault;
 	    }
 
-	    return response;
+
 	  }
 	
 	 /**