2 files changed, 3 insertions, 2 deletions
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateCMSSignatureCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateCMSSignatureCommandImpl.java
index 2dab3cf8..cbf0443f 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateCMSSignatureCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateCMSSignatureCommandImpl.java
@@ -110,8 +110,8 @@ public class CreateCMSSignatureCommandImpl extends
     CreateCMSSignatureRequestType request = getRequestValue();
 
     // DataObject, SigningCertificate, SigningTime
-    Date signingTime = new Date();
     try {
+      Date signingTime = request.isPAdESCompatibility() ? null : new Date();
       signature = new Signature(request.getDataObject(), request.getStructure(),
           signingCertificate, signingTime, commandContext.getURLDereferencer(),
           configurationFacade.getUseStrongHash());
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/cms/Signature.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/cms/Signature.java
index dc632ffd..8743192e 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/cms/Signature.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/cms/Signature.java
@@ -138,7 +138,8 @@ public class Signature {
     setMimeTypeAttrib(attributes, mimeType);
     setContentTypeAttrib(attributes);
     setSigningCertificateAttrib(attributes, signingCertificate);
-    setSigningTimeAttrib(attributes, signingTime);
+    if (signingTime != null)
+      setSigningTimeAttrib(attributes, signingTime);
     Attribute[] attributeArray = attributes.toArray(new Attribute[attributes.size()]);
     signerInfo.setSignedAttributes(attributeArray);
   }