X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=util-testing%2Forg%2Fcacert%2Fgigi%2Futil%2FSimpleSigner.java;h=a9ed46456a20680b0621d994183190c420b5be3e;hb=49b4bcfc4b1e890b0fc87b50878b23890e112937;hp=c07067e5fc1be9c9f06ea15f7bc8440b1a8d9edb;hpb=782d01544ecc4ed6319c59e41cb1b73bb3eb4827;p=gigi.git diff --git a/util-testing/org/cacert/gigi/util/SimpleSigner.java b/util-testing/org/cacert/gigi/util/SimpleSigner.java index c07067e5..a9ed4645 100644 --- a/util-testing/org/cacert/gigi/util/SimpleSigner.java +++ b/util-testing/org/cacert/gigi/util/SimpleSigner.java @@ -274,36 +274,40 @@ public class SimpleSigner { subj.put("CN", ""); System.out.println("WARNING: DN was empty"); } - String[] call = new String[] { - "openssl", "ca",// - "-in", - "../../" + csrname,// - "-cert", - "../" + ca + ".crt",// - "-keyfile", - "../" + ca + ".key",// - "-out", - "../../" + crt.getPath(),// - "-utf8", - "-startdate", - sdf.format(fromDate),// - "-enddate", - sdf.format(toDate),// - "-batch",// - "-md", - rs.getString("md"),// - "-extfile", - "../" + f.getName(),// - - "-subj", - Certificate.stringifyDN(subj),// - "-config", - "../selfsign.config"// - - }; + String[] call; + synchronized (sdf) { + call = new String[] { + "openssl", "ca",// + "-in", + "../../" + csrname,// + "-cert", + "../" + ca + ".crt",// + "-keyfile", + "../" + ca + ".key",// + "-out", + "../../" + crt.getPath(),// + "-utf8", + "-startdate", + sdf.format(fromDate),// + "-enddate", + sdf.format(toDate),// + "-batch",// + "-md", + rs.getString("md"),// + "-extfile", + "../" + f.getName(),// + + "-subj", + Certificate.stringifyDN(subj),// + "-config", + "../selfsign.config"// + }; + } + if (ct == CSRType.SPKAC) { call[2] = "-spkac"; } + Process p1 = Runtime.getRuntime().exec(call, null, new File("keys/unassured.ca")); int waitFor = p1.waitFor();