added support for dynamic algorithm suites / acos04

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

1 files changed, 26 insertions, 21 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java
index e415e98..3d48865 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/EnvelopedBase64BKUConnector.java
@@ -10,6 +10,9 @@ import java.util.Properties;
 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 

+

+import at.gv.egiz.pdfas.algorithmSuite.AlgorithmSuiteObject;

+import at.gv.egiz.pdfas.algorithmSuite.AlgorithmSuiteUtil;

 import at.gv.egiz.pdfas.exceptions.ErrorCode;

 import at.gv.egiz.pdfas.framework.ConnectorParameters;

 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

@@ -19,11 +22,19 @@ import at.knowcenter.wag.egov.egiz.sig.SignatureData;
 import at.knowcenter.wag.egov.egiz.sig.SignatureObject;

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

 import at.knowcenter.wag.egov.egiz.sig.connectors.Connector;

+import at.knowcenter.wag.egov.egiz.sig.connectors.ConnectorEnvironment;

 import at.knowcenter.wag.egov.egiz.sig.connectors.LocalConnector;

 import at.knowcenter.wag.egov.egiz.sig.connectors.TemplateReplaces;

 import at.knowcenter.wag.egov.egiz.sig.connectors.moa.EnvelopingBase64MOAConnector;

+import at.knowcenter.wag.egov.egiz.sig.connectors.mocca.MOCCAHelper;

+import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedIdFormatter;

+import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedLocRefMOAIdFormatter;

+import at.knowcenter.wag.egov.egiz.sig.sigid.DetachedMOCIdFormatter;

 import at.knowcenter.wag.egov.egiz.sig.sigid.HotfixIdFormatter;

 import at.knowcenter.wag.egov.egiz.sig.sigkz.SigKZIDHelper;

+import at.knowcenter.wag.egov.egiz.sig.signaturelayout.SignatureLayoutHandler;

+import at.knowcenter.wag.egov.egiz.sig.signaturelayout.SignatureLayoutHandlerFactory;

+import at.knowcenter.wag.egov.egiz.sig.signaturelayout.mocca.MOCCASignatureLayout10Handler;

 import at.knowcenter.wag.egov.egiz.tools.CodingHelper;

 import at.knowcenter.wag.egov.egiz.tools.FileHelper;

 

@@ -160,25 +171,19 @@ public class EnvelopedBase64BKUConnector implements Connector, LocalConnector
     log.debug("prepareXMLContent:"); //$NON-NLS-1$

     try

     {

-      String verify_template = this.environment.getVerifyTemplate();

-

-      String ids_string = so.getSigID();

-      String[] ids = SignatureObject.parseSigIds(ids_string);

-

-      X509Certificate cert = so.getX509Certificate();

-      String cert_alg = this.environment.getCertAlgEcdsa();

-      if (cert.getPublicKey().getAlgorithm().indexOf("RSA") >= 0) //$NON-NLS-1$

-      {

-        cert_alg = this.environment.getCertAlgRsa();

-      }

-

-      // cert alg replace

-      String verify_xml = verify_template.replaceFirst(TemplateReplaces.CERT_ALG_REPLACE, cert_alg);

-

+       String ids_string = so.getSigID();

+       String[] ids = SignatureObject.parseSigIds(ids_string);

+       

+       X509Certificate cert = so.getX509Certificate();

+       

+       // dferbas

+       AlgorithmSuiteObject algSuite = new AlgorithmSuiteObject();

+       String verify_xml = AlgorithmSuiteUtil.evaluateReplaceAlgs(algSuite, this.environment, so);

+       

       // data digest replace

       byte[] data_value = BKUHelper.prepareEnvelopingData(data);

       {

-        byte[] data_value_hash = CodingHelper.buildDigest(data_value);

+        byte[] data_value_hash = CodingHelper.buildDigest(data_value, algSuite.getDataDigestMethod());

         String object_data_hash = CodingHelper.encodeBase64(data_value_hash);

 

         verify_xml = verify_xml.replaceFirst(TemplateReplaces.DIGEST_VALUE_SIGNED_DATA_REPLACE, object_data_hash);

@@ -193,7 +198,7 @@ public class EnvelopedBase64BKUConnector implements Connector, LocalConnector
 

       // X.509 Certificate replace

       byte[] der = cert.getEncoded();

-      byte[] cert_hash = CodingHelper.buildDigest(der);

+      byte[] cert_hash = CodingHelper.buildDigest(der, algSuite.getCertDigestMethod());

       String certDigest = CodingHelper.encodeBase64(cert_hash);

       String x509_cert_string = CodingHelper.encodeBase64(der);

       verify_xml = verify_xml.replaceFirst(TemplateReplaces.X509_CERTIFICATE_REPLACE, x509_cert_string);

@@ -213,7 +218,7 @@ public class EnvelopedBase64BKUConnector implements Connector, LocalConnector
 

       // Signed Properties hash

       {

-        String sig_prop_hash = computeSignedPropertiesReplace(verify_xml);

+        String sig_prop_hash = computeSignedPropertiesReplace(verify_xml, algSuite);

 

         verify_xml = verify_xml.replaceFirst(TemplateReplaces.DIGEST_VALUE_SIGNED_PROPERTIES_REPLACE, sig_prop_hash);

       }

@@ -228,7 +233,7 @@ public class EnvelopedBase64BKUConnector implements Connector, LocalConnector
     }

   }

 

-  protected String computeSignedPropertiesReplace(String verify_xml)

+  protected String computeSignedPropertiesReplace(String verify_xml, AlgorithmSuiteObject algSuite)

   {

     try

     {

@@ -245,7 +250,7 @@ public class EnvelopedBase64BKUConnector implements Connector, LocalConnector
       log.debug("etsi:SignedProperties string to be hashed: " + string_to_be_hashed); //$NON-NLS-1$

 

       final byte[] bytes_to_be_hashed = string_to_be_hashed.getBytes("UTF-8"); //$NON-NLS-1$

-      byte[] sig_prop_code = CodingHelper.buildDigest(bytes_to_be_hashed);

+      byte[] sig_prop_code = CodingHelper.buildDigest(bytes_to_be_hashed, algSuite.getPropertiesDigestMethod());

       String sig_prop_hash = CodingHelper.encodeBase64(sig_prop_code);

 

       return sig_prop_hash;

@@ -397,7 +402,7 @@ public class EnvelopedBase64BKUConnector implements Connector, LocalConnector
    * 

    * @author wprinz

    */

-  public static class Environment

+  public static class Environment extends ConnectorEnvironment

   {

     /**

      * The configuration key of the sign keybox identifier.