[DB-Struct] implement SPKAC signing.

[gigi.git] / util / org / cacert / gigi / util / SimpleSigner.java

diff --git a/util/org/cacert/gigi/util/SimpleSigner.java b/util/org/cacert/gigi/util/SimpleSigner.java
index 36e94bdccf7ab93e974a847dede588a11a6189e0..c471586c90447fab868b35c0a4469be98913be0f 100644 (file)
--- a/util/org/cacert/gigi/util/SimpleSigner.java
+++ b/util/org/cacert/gigi/util/SimpleSigner.java
@@ -17,6 +17,7 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Properties;
 
+import org.cacert.gigi.Certificate.CSRType;
 import org.cacert.gigi.database.DatabaseConnection;
 
 public class SimpleSigner {
@@ -55,7 +56,7 @@ public class SimpleSigner {
                readyMail = DatabaseConnection
                        .getInstance()
                        .prepare(
-                               "SELECT emailcerts.id,emailcerts.csr_name,emailcerts.subject, jobs.id FROM jobs INNER JOIN emailcerts ON emailcerts.id=jobs.targetId"
+                               "SELECT emailcerts.id,emailcerts.csr_name,emailcerts.subject, jobs.id,csr_type FROM jobs INNER JOIN emailcerts ON emailcerts.id=jobs.targetId"
                                        + " WHERE jobs.state='open'"//
                                        + " AND task='sign'");
 
@@ -157,18 +158,23 @@ public class SimpleSigner {
                        String csrname = rs.getString(2);
                        System.out.println("sign: " + csrname);
                        int id = rs.getInt(1);
+                       String csrType = rs.getString(5);
+                       CSRType ct = CSRType.valueOf(csrType);
                        File crt = KeyStorage.locateCrt(id);
                        String[] call = new String[] { "openssl", "ca",//
+                                       "-in", "../" + csrname,//
                                        "-cert", "testca.crt",//
                                        "-keyfile", "testca.key",//
-                                       "-in", "../" + csrname,//
                                        "-out", "../" + crt.getPath(),//
                                        "-days", "356",//
                                        "-batch",//
                                        "-subj", rs.getString(3),//
-                                       "-config", "selfsign.config"
+                                       "-config", "selfsign.config"//
 
                        };
+                       if (ct == CSRType.SPKAC) {
+                               call[2] = "-spkac";
+                       }
                        Process p1 = Runtime.getRuntime().exec(call, null, new File("keys"));
 
                        int waitFor = p1.waitFor();