From c623dc5a78e03c5f944efb4cb8d628797a1c215f Mon Sep 17 00:00:00 2001
From: ferbas <ferbas@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Tue, 27 Oct 2009 11:14:26 +0000
Subject: 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
---
 .../mocca/LocRefDetachedMOCCAConnector.java        | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java')

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
index bcf40fc..a16dbf8 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
@@ -8,6 +8,9 @@ import java.util.regex.Pattern;
 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;
@@ -17,6 +20,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.LocalConnector;
 import at.knowcenter.wag.egov.egiz.sig.connectors.TemplateReplaces;
 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.BKUHelper;
@@ -204,23 +208,19 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
    public String prepareXMLContent(SignatureData data, SignSignatureObject so) throws ConnectorException {
       log.debug("prepareXMLContent:"); 
       try {
-         String verify_template = this.environment.getVerifyTemplate();
-
+         
          String ids_string = so.getSigID();
          String sigId = this.parseSigId(ids_string);
 
          X509Certificate cert = so.getX509Certificate();
-         String cert_alg = this.environment.getCertAlgEcdsa();
-         if (cert.getPublicKey().getAlgorithm().indexOf("RSA") >= 0) 
-         {
-            cert_alg = this.environment.getCertAlgRsa();
-         }
-
-         // cert alg replace
-         String verify_xml = verify_template.replaceFirst(TemplateReplaces.CERT_ALG_REPLACE, cert_alg);
+                  
+         
+         // dferbas
+         AlgorithmSuiteObject algSuite = new AlgorithmSuiteObject();
+         String verify_xml = AlgorithmSuiteUtil.evaluateReplaceAlgs(algSuite, this.environment, so);
 
          // data digest replace
-         byte[] data_value_hash = CodingHelper.buildDigest(data.getDataSource());
+         byte[] data_value_hash = CodingHelper.buildDigest(data.getDataSource(), algSuite.getDataDigestMethod());
          String object_data_hash = CodingHelper.encodeBase64(data_value_hash);
 
          // template replacements
@@ -230,7 +230,7 @@ public class LocRefDetachedMOCCAConnector 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);
@@ -252,7 +252,7 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
             String string_to_be_hashed = matcher.group(1);
             log.debug("SignedProperties string to be hashed: " + string_to_be_hashed); 
             final byte[] bytes_to_be_hashed = string_to_be_hashed.getBytes("UTF-8"); 
-            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);
@@ -270,7 +270,7 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
     * Holds environment configuration information like templates.
     * @author wprinz
     */
-   public static class Environment {
+   public static class Environment extends ConnectorEnvironment {
       
       /**
        * The configuration key of the sign keybox identifier.
-- 
cgit v1.2.3