From aabb36836ebfca9fe8cdc70dff13c0be7e5e761c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 20 Dec 2016 17:00:45 +0100
Subject: add next missing parts for new TSL lib

---
 .../moa/spss/server/config/ConfigurationPartsBuilder.java          | 5 ++---
 .../moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java  | 7 +++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'moaSig/moa-sig-lib/src/main')

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
index e134d57..6c826ad 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
@@ -31,7 +31,6 @@ import iaik.pki.revocation.RevocationSourceTypes;
 import iaik.server.modules.xml.BlackListEntry;
 import iaik.server.modules.xml.ExternalReferenceChecker;
 import iaik.server.modules.xml.WhiteListEntry;
-import iaik.util.logging.Log;
 import iaik.utils.RFC2253NameParser;
 import iaik.utils.RFC2253NameParserException;
 import iaik.xml.crypto.utils.URI;
@@ -433,7 +432,7 @@ public class ConfigurationPartsBuilder {
     	try {
     		defaultConnectionTimeout = Integer.parseInt(connectionTimeout);
     	} catch(NumberFormatException e) {
-    		Log.warn("Configuration value " + CONNECTION_TIMEOUT_XPATH_ + " should be a number defaulting to 30");
+    		Logger.warn("Configuration value " + CONNECTION_TIMEOUT_XPATH_ + " should be a number defaulting to 30");
     	}
     }
     
@@ -453,7 +452,7 @@ public class ConfigurationPartsBuilder {
     	try {
     		defaultConnectionTimeout = Integer.parseInt(connectionTimeout);
     	} catch(NumberFormatException e) {
-    		Log.warn("Configuration value " + READ_TIMEOUT_XPATH_ + " should be a number defaulting to 30");
+    		Logger.warn("Configuration value " + READ_TIMEOUT_XPATH_ + " should be a number defaulting to 30");
     	}
     }
     
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
index 789336e..d8ebd85 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
@@ -46,6 +46,7 @@ import at.gv.egovernment.moa.spss.api.common.Content;
 import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult;
 import at.gv.egovernment.moa.spss.api.common.InputData;
 import at.gv.egovernment.moa.spss.api.common.SignerInfo;
+import at.gv.egovernment.moa.spss.api.common.TslInfos;
 import at.gv.egovernment.moa.spss.api.impl.InputDataBinaryImpl;
 import at.gv.egovernment.moa.spss.api.impl.InputDataXMLImpl;
 import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResultInfo;
@@ -160,7 +161,8 @@ public class VerifyXMLSignatureResponseBuilder {
     boolean checkSSCD,
     boolean sscdSourceTSL,
     boolean isTSLEnabledTrustprofile,
-    String issuerCountryCode)
+    String issuerCountryCode,
+    TslInfos tslInfos)
     throws MOAApplicationException {
 
     CertificateValidationResult certResult =
@@ -187,7 +189,8 @@ public class VerifyXMLSignatureResponseBuilder {
         checkSSCD,
         sscdSourceTSL,
         issuerCountryCode,
-              result.getSigningTime());
+        result.getSigningTime(),
+        tslInfos);
 
     // Create HashInputData Content objects
     referenceDataList = result.getReferenceDataList();
-- 
cgit v1.2.3