X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=util%2Forg%2Fcacert%2Fgigi%2Futil%2FSimpleSigner.java;h=9752dbf3d1c137271ac47cfb97fd865335e6e3ab;hp=d234aa087eeb243357db3957b239da444b9e9428;hb=8959f2a060d50516711d2c9677ec83f297f44f35;hpb=6edfeaf6c6f7e4311e084d75be62629abb862dc8

diff --git a/util/org/cacert/gigi/util/SimpleSigner.java b/util/org/cacert/gigi/util/SimpleSigner.java
index d234aa08..9752dbf3 100644
--- a/util/org/cacert/gigi/util/SimpleSigner.java
+++ b/util/org/cacert/gigi/util/SimpleSigner.java
@@ -64,20 +64,20 @@ public class SimpleSigner {
             throw new IllegalStateException("already running");
         }
         running = true;
-        readyCerts = DatabaseConnection.getInstance().prepare("SELECT emailcerts.id AS id, emailcerts.csr_name, emailcerts.subject, jobs.id AS jobid, csr_type, md, keyUsage, extendedKeyUsage FROM jobs " + //
-                "INNER JOIN emailcerts ON emailcerts.id=jobs.targetId " + //
-                "INNER JOIN profiles ON profiles.id=emailcerts.profile " + //
+        readyCerts = DatabaseConnection.getInstance().prepare("SELECT certs.id AS id, certs.csr_name, certs.subject, jobs.id AS jobid, csr_type, md, keyUsage, extendedKeyUsage 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'");
 
         getSANSs = DatabaseConnection.getInstance().prepare("SELECT contents, type FROM subjectAlternativeNames " + //
                 "WHERE certId=?");
 
-        updateMail = DatabaseConnection.getInstance().prepare("UPDATE emailcerts SET crt_name=?," + " created=NOW(), serial=? WHERE id=?");
+        updateMail = DatabaseConnection.getInstance().prepare("UPDATE certs SET crt_name=?," + " created=NOW(), serial=? WHERE id=?");
         warnMail = DatabaseConnection.getInstance().prepare("UPDATE jobs SET warning=warning+1, state=IF(warning<3, 'open','error') WHERE id=?");
 
-        revoke = DatabaseConnection.getInstance().prepare("SELECT emailcerts.id, emailcerts.csr_name,jobs.id FROM jobs INNER JOIN emailcerts ON jobs.targetId=emailcerts.id" + " WHERE jobs.state='open' AND task='revoke'");
-        revokeCompleted = DatabaseConnection.getInstance().prepare("UPDATE emailcerts SET revoked=NOW() WHERE id=?");
+        revoke = DatabaseConnection.getInstance().prepare("SELECT certs.id, certs.csr_name,jobs.id FROM jobs INNER JOIN certs ON jobs.targetId=certs.id" + " WHERE jobs.state='open' AND task='revoke'");
+        revokeCompleted = DatabaseConnection.getInstance().prepare("UPDATE certs SET revoked=NOW() WHERE id=?");
 
         finishJob = DatabaseConnection.getInstance().prepare("UPDATE jobs SET state='done' WHERE id=?");
 
@@ -123,17 +123,17 @@ public class SimpleSigner {
             String[] call = new String[] {
                     "openssl", "ca",//
                     "-cert",
-                    "testca.crt",//
+                    "../unassured.crt",//
                     "-keyfile",
-                    "testca.key",//
+                    "../unassured.key",//
                     "-revoke",
-                    "../" + crt.getPath(),//
+                    "../../" + crt.getPath(),//
                     "-batch",//
                     "-config",
-                    "selfsign.config"
+                    "../selfsign.config"
 
             };
-            Process p1 = Runtime.getRuntime().exec(call, null, new File("keys"));
+            Process p1 = Runtime.getRuntime().exec(call, null, new File("keys/unassured.ca"));
             System.out.println("revoking: " + crt.getPath());
             if (p1.waitFor() == 0) {
                 worked = true;
@@ -154,19 +154,19 @@ public class SimpleSigner {
         String[] call = new String[] {
                 "openssl", "ca",//
                 "-cert",
-                "testca.crt",//
+                "../unassured.crt",//
                 "-keyfile",
-                "testca.key",//
+                "../unassured.key",//
                 "-gencrl",//
                 "-crlhours",//
                 "12",//
                 "-out",
-                "testca.crl",//
+                "../unassured.crl",//
                 "-config",
-                "selfsign.config"
+                "../selfsign.config"
 
         };
-        Process p1 = Runtime.getRuntime().exec(call, null, new File("keys"));
+        Process p1 = Runtime.getRuntime().exec(call, null, new File("keys/unassured.ca"));
         if (p1.waitFor() != 0) {
             System.out.println("Error while generating crl.");
         }
@@ -211,31 +211,31 @@ public class SimpleSigner {
             String[] call = new String[] {
                     "openssl", "ca",//
                     "-in",
-                    "../" + csrname,//
+                    "../../" + csrname,//
                     "-cert",
-                    "testca.crt",//
+                    "../unassured.crt",//
                     "-keyfile",
-                    "testca.key",//
+                    "../unassured.key",//
                     "-out",
-                    "../" + crt.getPath(),//
+                    "../../" + crt.getPath(),//
                     "-days",
                     "356",//
                     "-batch",//
                     "-md",
                     rs.getString("md"),//
                     "-extfile",
-                    f.getName(),//
+                    "../" + f.getName(),//
 
                     "-subj",
                     rs.getString("subject"),//
                     "-config",
-                    "selfsign.config"//
+                    "../selfsign.config"//
 
             };
             if (ct == CSRType.SPKAC) {
                 call[2] = "-spkac";
             }
-            Process p1 = Runtime.getRuntime().exec(call, null, new File("keys"));
+            Process p1 = Runtime.getRuntime().exec(call, null, new File("keys/unassured.ca"));
 
             int waitFor = p1.waitFor();
             f.delete();