1 files changed, 57 insertions, 10 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java b/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java
index 6f167c8..2c5ecf5 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java
@@ -35,9 +35,12 @@ import at.knowcenter.wag.egov.egiz.pdf.PositioningInstruction;
 import at.knowcenter.wag.egov.egiz.pdf.ReplaceInfo;
 import at.knowcenter.wag.egov.egiz.pdf.StringInfo;
 import at.knowcenter.wag.egov.egiz.pdf.TablePos;
+import at.knowcenter.wag.egov.egiz.sig.SignatureData;
+import at.knowcenter.wag.egov.egiz.sig.SignatureDataImpl;
 import at.knowcenter.wag.egov.egiz.sig.SignatureFieldDefinition;
 import at.knowcenter.wag.egov.egiz.sig.SignatureObject;
 import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;
+import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObjectHelper;
 import at.knowcenter.wag.exactparser.ByteArrayUtils;
 
 import com.lowagie.text.pdf.PdfPTable;
@@ -67,6 +70,14 @@ public class BinarySignator_1_0_0 implements Signator
   public static final PdfASID MY_ID = new PdfASID(SignatorFactory.VENDOR, SignatorFactory.TYPE_BINARY, SignatorFactory.VERSION_1_0_0);
 
   /**
+   * @see at.knowcenter.wag.egov.egiz.framework.Signator#getMyId()
+   */
+  public PdfASID getMyId()
+  {
+    return MY_ID;
+  }
+
+  /**
    * Default constructor.
    */
   public BinarySignator_1_0_0()
@@ -86,7 +97,7 @@ public class BinarySignator_1_0_0 implements Signator
       SignatureObject signature_object = PdfAS.createSignatureObjectFromType(signature_type);
       signature_object.fillValues((char) BinarySignature.LAYOUT_PLACEHOLDER, has_SIG_ID);
 
-      signature_object.setKZ(MY_ID);
+      signature_object.setKZ(getMyId());
 
       PdfPTable pdf_table = PdfAS.createPdfPTableFromSignatureObject(signature_object);
 
@@ -108,8 +119,8 @@ public class BinarySignator_1_0_0 implements Signator
       }
       IncrementalUpdateInformation iui = BinarySignature.writeIncrementalUpdate(pdf, pdf_table, pi, variable_field_definitions, all_field_definitions);
 
-      String temp_string = iui.temp_ir_number + " " + iui.temp_ir_generation + " obj";
-      byte[] temp_bytes = temp_string.getBytes("US-ASCII");
+      String temp_string = iui.temp_ir_number + " " + iui.temp_ir_generation + " obj"; //$NON-NLS-1$//$NON-NLS-2$
+      byte[] temp_bytes = temp_string.getBytes("US-ASCII"); //$NON-NLS-1$
       int temp_start = ByteArrayUtils.lastIndexOf(iui.signed_pdf, temp_bytes);
       byte[] stream_bytes = new byte[] { '>', '>', 's', 't', 'r', 'e', 'a',
           'm', 0x0A };
@@ -142,7 +153,7 @@ public class BinarySignator_1_0_0 implements Signator
       // byte [] old_signed_pdf = iui.signed_pdf;
       iui.signed_pdf = BinarySignature.prepareDataToSign(iui.signed_pdf, iui.byte_ranges);
 
-      iui.document_text = BinarySignature.retrieveSignableTextFromData(iui.signed_pdf, iui.signed_pdf.length); // signed_pdf.length);
+      iui.signature_data = formSignatureData(iui);
 
       return iui;
 
@@ -160,18 +171,54 @@ public class BinarySignator_1_0_0 implements Signator
   public SignResult finishSign(IncrementalUpdateInformation iui) throws PresentableException
   {
     // PdfAS.prefixID(iui.signed_signature_object, PdfAS.BINARY_ID);
+    fillReplacesWithValues(iui);
+    BinarySignature.replaceCertificate(iui);
+    BinarySignature.replacePlaceholders(iui);
+
+    SignResult sign_result = new SignResult(PdfAS.PDF_MIME_TYPE, iui.signed_pdf);
+    return sign_result;
+  }
+
+  /**
+   * Reads the signature values from the signed signature object and fills the
+   * corresponding value in the Replaces array.
+   * 
+   * @param iui
+   *          The IncrementalUpdateInformation.
+   */
+  protected void fillReplacesWithValues(IncrementalUpdateInformation iui)
+  {
     Iterator it = iui.replaces.iterator();
     while (it.hasNext())
     {
       ReplaceInfo ri = (ReplaceInfo) it.next();
+      
+      ri.value = SignSignatureObjectHelper.retrieveStringValueFromSignatureObject(iui.signed_signature_object, ri.sfd.field_name);
+    }
+  }
+
+  /**
+   * Forms the SignatureData to be used for signing.
+   * 
+   * @param iui
+   *          The IncrementalUpdateInformation.
+   * @return Returns the SignatureData to be used for signing.
+   */
+  protected SignatureData formSignatureData(IncrementalUpdateInformation iui)
+  {
+    String document_text = BinarySignature.retrieveSignableTextFromData(iui.signed_pdf, iui.signed_pdf.length); // signed_pdf.length);
 
-      ri.value = iui.signed_signature_object.getSigValue(ri.sfd.field_name);
+    byte[] data;
+    try
+    {
+      data = document_text.getBytes("UTF-8"); //$NON-NLS-1$
     }
-    BinarySignature.replaceCertificate(iui);
-    BinarySignature.replacePlaceholders(iui);
+    catch (UnsupportedEncodingException e)
+    {
+      throw new RuntimeException("Very strange: UTF-8 character encoding not supported.", e); //$NON-NLS-1$
+    }
+    SignatureData signature_data = new SignatureDataImpl(data, PdfAS.PDF_MIME_TYPE);
 
-    SignResult sign_result = new SignResult(PdfAS.PDF_MIME_TYPE, iui.signed_pdf);
-    return sign_result;
+    return signature_data;
   }
-
 }