Detached Multipart BKU for Auftrag "Support"

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@73 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

2 files changed, 47 insertions, 10 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/BinarySignature.java b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/BinarySignature.java
index e10061c..52d1d9f 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/BinarySignature.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/BinarySignature.java
@@ -27,6 +27,8 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;

 import java.security.MessageDigest;

 import java.security.NoSuchAlgorithmException;

+import java.security.cert.CertificateEncodingException;

+import java.security.cert.X509Certificate;

 import java.util.ArrayList;

 import java.util.Collections;

 import java.util.Comparator;

@@ -1131,11 +1133,11 @@ public abstract class BinarySignature
    */

   public static void replaceCertificate(IncrementalUpdateInformation iui) throws PDFDocumentException

   {

-    X509Cert cert = iui.signed_signature_object.getX509Cert();

-    // X509Certificate certificate = cert.getX509Certificate();

+    X509Certificate certificate = iui.signed_signature_object.getX509Certificate();

     try

     {

-      byte[] encoded = cert.getCertString().getBytes("US-ASCII"); // certificate.getEncoded();

+      byte[] der = certificate.getEncoded();

+      byte[] encoded = CodingHelper.encodeBase64(der).getBytes("US-ASCII");

       byte[] escaped = Placeholder.escapePDFString(encoded);

       if (escaped.length > iui.cert_length)

       {

@@ -1143,14 +1145,38 @@ public abstract class BinarySignature
       }

       System.arraycopy(escaped, 0, iui.signed_pdf, iui.cert_start, escaped.length);

     }

-    // catch (CertificateEncodingException e)

-    // {

-    // throw new PDFDocumentException(300, e);

-    // }

+    catch (CertificateEncodingException e)

+    {

+      throw new PDFDocumentException(300, e);

+    }

     catch (UnsupportedEncodingException e)

     {

       throw new PDFDocumentException(300, e);

     }

+

+    // X509Cert cert = iui.signed_signature_object.getX509Cert();

+    // // X509Certificate certificate = cert.getX509Certificate();

+    // try

+    // {

+    // byte[] encoded = cert.getCertString().getBytes("US-ASCII"); //

+    // certificate.getEncoded();

+    // byte[] escaped = Placeholder.escapePDFString(encoded);

+    // if (escaped.length > iui.cert_length)

+    // {

+    // throw new PlaceholderException("certificate", escaped.length -

+    // iui.cert_length);

+    // }

+    // System.arraycopy(escaped, 0, iui.signed_pdf, iui.cert_start,

+    // escaped.length);

+    // }

+    // // catch (CertificateEncodingException e)

+    // // {

+    // // throw new PDFDocumentException(300, e);

+    // // }

+    // catch (UnsupportedEncodingException e)

+    // {

+    // throw new PDFDocumentException(300, e);

+    // }

   }

 

   /**

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/IncrementalUpdateInformation.java b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/IncrementalUpdateInformation.java
index cb983cb..76c59c3 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/IncrementalUpdateInformation.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/IncrementalUpdateInformation.java
@@ -20,7 +20,9 @@ package at.knowcenter.wag.egov.egiz.pdf;
 import java.io.Serializable;

 import java.util.List;

 

+import at.knowcenter.wag.egov.egiz.sig.SignatureData;

 import at.knowcenter.wag.egov.egiz.sig.SignatureObject;

+import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject;

 

 /**

  * This parameter object contains all useful inforamtion the binary incremental

@@ -105,10 +107,19 @@ public class IncrementalUpdateInformation implements Serializable
    */

   public int content_stream_length = -1;

 

+//  /**

+//   * The document text for signing.

+//   */

+//  public String document_text;

   /**

-   * The document text for signing.

+   * The data to be signed or verified.

+   * 

+   * <p>

+   * For text signature this is the document text.

+   * For binary signature this is the PDF document.

+   * </p>

    */

-  public String document_text;

+  public SignatureData signature_data = null;

 

   /**

    * The SignatureObject containing the variable values after the document text

@@ -117,7 +128,7 @@ public class IncrementalUpdateInformation implements Serializable
    * These values have to be filled in.

    * </p>

    */

-  public SignatureObject signed_signature_object;

+  public SignSignatureObject signed_signature_object;

 

   /**

    * The start of the /encodings array.