From 84293bd12f63b59852026cab02035fc9ebee626a Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@iaik.tugraz.at>
Date: Mon, 14 Mar 2016 16:29:03 +0100
Subject: A lot of moa sig stuff

---
 .../spss/tsl/utils/TSLImportFromFileContext.java   | 27 +++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java')

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java
index 5d69f69..eda2b34 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java
@@ -2,6 +2,7 @@ package at.gv.egovernment.moa.spss.tsl.utils;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileFilter;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
@@ -36,10 +37,10 @@ import org.xml.sax.SAXParseException;
 
 import at.gv.egovernment.moa.spss.tsl.exception.MitigatedTSLSecurityException;
 import iaik.util.logging.Log.MultiThreadLoggingGroup;
-import iaik.util.logging._l;
+import iaik.util.logging.GeneralLog;
 import iaik.utils.RFC2253NameParserException;
 import iaik.utils.Util;
-import iaik.util._15;
+import iaik.util.GeneralUtils15;
 import iaik.xml.crypto.dsig.keyinfo.X509DataImpl;
 import iaik.xml.crypto.tsl.DbTables;
 import iaik.xml.crypto.tsl.TSLConstants;
@@ -243,7 +244,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 				if (parameters[0] instanceof DOMError) {
 					DOMError domError = (DOMError) parameters[0];
 
-					_l.warn(""+domError.getRelatedData());
+					GeneralLog.warn(""+domError.getRelatedData());
 
 					//					domError.getRelatedData().getClass().getField("")
 
@@ -277,9 +278,9 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 
 					String[] rdns = subDN.substring(1, subDN.length()).split("/");
 
-					rdns = (String[]) _15.reverseInPlace(rdns);
+					rdns = (String[]) GeneralUtils15.reverseInPlace(rdns);
 
-					subDN = "/"+_15.implode("/", rdns);
+					subDN = "/"+GeneralUtils15.implode("/", rdns);
 
 					//for now we only support properly quoted values or such without quotes
 
@@ -375,7 +376,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 					}
 				}
 
-				_l.err("Ignoring download error using old: " + parameters[0], null);
+				GeneralLog.err("Ignoring download error using old: " + parameters[0], null);
 				wrapException(e);
 				return parameters[1];
 			}
@@ -448,7 +449,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 				X509Certificate crt = (X509Certificate)parameters[1];
 
 		    File f = new File("./wrong/"+expectedTerritory_+"/",
-		    	iaik.util._15.toHexString(getFingerPrint(crt,
+		    	iaik.util.GeneralUtils15.toHexString(getFingerPrint(crt,
 		    		new byte[TSLConstants.CertHash.LENGTH]))+".der");
 		    File parent = f.getParentFile();
 		    if(!parent.exists() && !parent.mkdirs()){
@@ -571,7 +572,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 			    	li.next();
 			    	String sn = (String) li.next();
 			    	
-			    	_l.err(sn, null);
+			    	GeneralLog.err(sn, null);
 			    	
 			    	System.exit(1);
 			    	
@@ -796,7 +797,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 
 		String msg = e.getMessage();
 
-		_l.info(msg);
+		GeneralLog.info(msg);
 		return(
 			msg.startsWith("["+SQLiteErrorCode.SQLITE_CONSTRAINT.name()+"]") &&
 			msg.contains("column " + DbTables.TSLDownload.C.rawHash + " is not unique")
@@ -804,7 +805,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 	}
 
 	@Override
-	protected Long getLocalLastModified(File targetFile) {
+	protected File getLocalLastModified(File targetFile) {
 		return super.getLocalLastModified(targetFile);
 	}
 	@Override
@@ -830,7 +831,7 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 			synchronized (log) {
 				parentContext_.print("<" + ncName + " state=\"" + currentThread.getState()
 				    + "\" " + " id=\"" + currentThread.getId() + "\">\n" + log.toString() + "</"
-				    + ncName + ">" + _15.LB);
+				    + ncName + ">" + GeneralUtils15.LB);
 				parentContext_.flushLog();
 				log.setLength(0);
 			}
@@ -846,5 +847,9 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF
 			log.append(msg);
 		}
 	}
+	@Override
+	public FileFilter getCertificateFileFilter() {
+		return null;
+	}
 	
 }
\ No newline at end of file
-- 
cgit v1.2.3