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, 14 insertions, 16 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java
index a6db63c..90625b4 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/EnvelopingBase64MOAConnector.java
@@ -9,6 +9,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.framework.ConnectorParameters;

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

 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;

@@ -16,6 +19,7 @@ import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;
 import at.knowcenter.wag.egov.egiz.sig.SignatureData;

 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.TemplateReplaces;

 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.BKUHelper;

 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.BKUPostConnection;

@@ -218,7 +222,7 @@ public class EnvelopingBase64MOAConnector implements Connector
 

     BKUHelper.checkResponseForError(response_string);

 

-    SignSignatureObject so = MOAHelper.parseCreateXMLResponse(response_string, new OldMOAIdFormatter());

+    SignSignatureObject so = MOAHelper.parseCreateXMLResponse(response_string, new OldMOAIdFormatter(), this.environment);

 

     log.debug("analyzeSignResponse finished."); //$NON-NLS-1$

     return so;

@@ -267,22 +271,16 @@ public class EnvelopingBase64MOAConnector implements Connector
     log.debug("prepareXMLContent:"); //$NON-NLS-1$

     try

     {

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

-

-      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);

+       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);

@@ -292,7 +290,7 @@ public class EnvelopingBase64MOAConnector implements Connector
 

       // 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);

@@ -323,7 +321,7 @@ public class EnvelopingBase64MOAConnector implements Connector
         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);

 

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

@@ -344,7 +342,7 @@ public class EnvelopingBase64MOAConnector implements Connector
    * 

    * @author wprinz

    */

-  public static class Environment

+  public static class Environment extends ConnectorEnvironment

   {

     /**

      * The configuration key of the sign keybox identifier.