X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=util-testing%2Forg%2Fcacert%2Fgigi%2Futil%2FSimpleSigner.java;h=1cc9e9eeae6e8e7851e540113a6cc1da1fda9ce8;hp=bc2ee366db8da71e09ba1118332f010ce551be77;hb=19e3cf0a9d14c0a8658b7e9058ac6fbdf581a32e;hpb=2172993aef7ec7f87133c3ed60cec398afdb82c1 diff --git a/util-testing/org/cacert/gigi/util/SimpleSigner.java b/util-testing/org/cacert/gigi/util/SimpleSigner.java index bc2ee366..1cc9e9ee 100644 --- a/util-testing/org/cacert/gigi/util/SimpleSigner.java +++ b/util-testing/org/cacert/gigi/util/SimpleSigner.java @@ -127,7 +127,7 @@ public class SimpleSigner { "INNER JOIN certs ON certs.id=jobs.`targetId` " + // "INNER JOIN profiles ON profiles.id=certs.profile " + // "WHERE jobs.state='open' "// - + "AND task='sign'"); + + "AND task='sign'"); getSANSs = new GigiPreparedStatement("SELECT contents, type FROM `subjectAlternativeNames` " + // "WHERE `certId`=?"); @@ -329,7 +329,11 @@ public class SimpleSigner { } String ca = caP.getProperty("ca") + "_2015_1"; File parent = new File("signer/ca"); - for (File f : parent.listFiles()) { + File[] caFiles = parent.listFiles(); + if (null == caFiles) { + caFiles = new File[0]; + } + for (File f : caFiles) { if (f.getName().startsWith(caP.getProperty("ca"))) { ca = f.getName(); break;