X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=util-testing%2Forg%2Fcacert%2Fgigi%2Futil%2FSimpleSigner.java;h=1344d56229632eb2922babf7588e0543dd432f8b;hp=1cc9e9eeae6e8e7851e540113a6cc1da1fda9ce8;hb=9b01e471cde09546f79c8182d470d6cccdf60623;hpb=19e3cf0a9d14c0a8658b7e9058ac6fbdf581a32e

diff --git a/util-testing/org/cacert/gigi/util/SimpleSigner.java b/util-testing/org/cacert/gigi/util/SimpleSigner.java
index 1cc9e9ee..1344d562 100644
--- a/util-testing/org/cacert/gigi/util/SimpleSigner.java
+++ b/util-testing/org/cacert/gigi/util/SimpleSigner.java
@@ -28,6 +28,7 @@ import java.text.SimpleDateFormat;
 import java.util.Base64;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -126,8 +127,8 @@ public class SimpleSigner {
                     readyCerts = new GigiPreparedStatement("SELECT certs.id AS id, certs.csr_name, jobs.id AS jobid, csr_type, md, `executeFrom`, `executeTo`, profile FROM jobs " + //
                             "INNER JOIN certs ON certs.id=jobs.`targetId` " + //
                             "INNER JOIN profiles ON profiles.id=certs.profile " + //
-                            "WHERE jobs.state='open' "//
-                            + "AND task='sign'");
+                            "WHERE jobs.state='open' " + //
+                            "AND task='sign'");
 
                     getSANSs = new GigiPreparedStatement("SELECT contents, type FROM `subjectAlternativeNames` " + //
                             "WHERE `certId`=?");
@@ -327,16 +328,20 @@ public class SimpleSigner {
                     PKCS10 p10 = new PKCS10(PEM.decode("(NEW )?CERTIFICATE REQUEST", new String(data, "UTF-8")));
                     pk = p10.getSubjectPublicKeyInfo();
                 }
-                String ca = caP.getProperty("ca") + "_2015_1";
+                Calendar cal = GregorianCalendar.getInstance();
+                String ca = caP.getProperty("ca") + "_" + cal.get(Calendar.YEAR) + (cal.get(Calendar.MONTH) >= 6 ? "_2" : "_1");
                 File parent = new File("signer/ca");
                 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;
+                if ( !new File(parent, ca).exists()) {
+                    System.out.println("CA " + ca + " not found. Searching for anything other remotely fitting.");
+                    for (File f : caFiles) {
+                        if (f.getName().startsWith(caP.getProperty("ca"))) {
+                            ca = f.getName();
+                            break;
+                        }
                     }
                 }
                 File caKey = new File(parent, ca + "/ca.key");
@@ -507,35 +512,37 @@ public class SimpleSigner {
 
     private static byte[] generateEKU(String eku) throws IOException {
 
-        DerOutputStream dos = new DerOutputStream();
-        for (String name : eku.split(",")) {
-            ObjectIdentifier oid;
-            switch (name) {
-            case "serverAuth":
-                oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.1");
-                break;
-            case "clientAuth":
-                oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.2");
-                break;
-            case "codeSigning":
-                oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.3");
-                break;
-            case "emailProtection":
-                oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.4");
-                break;
-            case "OCSPSigning":
-                oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.9");
-                break;
-
-            default:
-                throw new Error(name);
+        try (DerOutputStream dos = new DerOutputStream()) {
+            for (String name : eku.split(",")) {
+                name = name.trim();
+                ObjectIdentifier oid;
+                switch (name) {
+                case "serverAuth":
+                    oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.1");
+                    break;
+                case "clientAuth":
+                    oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.2");
+                    break;
+                case "codeSigning":
+                    oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.3");
+                    break;
+                case "emailProtection":
+                    oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.4");
+                    break;
+                case "OCSPSigning":
+                    oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.9");
+                    break;
+
+                default:
+                    throw new Error(name);
+                }
+                dos.putOID(oid);
             }
-            dos.putOID(oid);
+            byte[] data = dos.toByteArray();
+            dos.reset();
+            dos.write(DerValue.tag_Sequence, data);
+            return dos.toByteArray();
         }
-        byte[] data = dos.toByteArray();
-        dos.reset();
-        dos.write(DerValue.tag_Sequence, data);
-        return dos.toByteArray();
     }
 
     public static X500Name genX500Name(Map<String, String> subj) throws IOException {