Merge "add: include Microsoft codesigning OIDs to SimpleSigner"

[gigi.git] / util-testing / club / wpia / gigi / util / SimpleSigner.java

diff --git a/util-testing/club/wpia/gigi/util/SimpleSigner.java b/util-testing/club/wpia/gigi/util/SimpleSigner.java
index b1c31509e88926e38f2dd49752e4852bd92d48a4..4fb1873d8375c6be75ef0c1b756c9f10a5146c6d 100644 (file)
--- a/util-testing/club/wpia/gigi/util/SimpleSigner.java
+++ b/util-testing/club/wpia/gigi/util/SimpleSigner.java
@@ -100,6 +100,7 @@ public class SimpleSigner {
             p.load(reader);
         }
         ServerConstants.init(p);
+        TimeConditions.init(p);
         DatabaseConnection.init(p);
 
         runSigner();
@@ -139,7 +140,7 @@ public class SimpleSigner {
                             "WHERE `certId`=?");
 
                     updateMail = new GigiPreparedStatement("UPDATE certs SET created=NOW(), serial=?, caid=?, expire=? WHERE id=?");
-                    warnMail = new GigiPreparedStatement("UPDATE jobs SET warning=warning+1, state=CASE WHEN warning<3 THEN 'open'::`jobState` ELSE 'error'::`jobState` END WHERE id=?");
+                    warnMail = new GigiPreparedStatement("UPDATE jobs SET attempt=attempt+1, state=CASE WHEN attempt<3 THEN 'open'::`jobState` ELSE 'error'::`jobState` END WHERE id=?");
 
                     revoke = new GigiPreparedStatement("SELECT certs.id, jobs.id FROM jobs INNER JOIN certs ON jobs.`targetId`=certs.id" + " WHERE jobs.state='open' AND task='revoke'");
                     revokeCompleted = new GigiPreparedStatement("UPDATE `certs` SET revoked=NOW() WHERE id=?");
@@ -557,7 +558,12 @@ public class SimpleSigner {
                 case "OCSPSigning":
                     oid = new ObjectIdentifier("1.3.6.1.5.5.7.3.9");
                     break;
-
+                case "msCodeInd":
+                    oid = new ObjectIdentifier("1.3.6.1.4.1.311.2.1.21");
+                    break;
+                case "msCodeCom":
+                    oid = new ObjectIdentifier("1.3.6.1.4.1.311.2.1.22");
+                    break;
                 default:
                     throw new Error(name);
                 }