From dd08e76b61c848c75e6a8ca0d9f4a6b22ac112b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Thu, 25 Aug 2016 16:35:06 +0200 Subject: [PATCH] upd: make simple Signer more intelligent in choosing CA certificate Change-Id: I24420cc7a5cd78b460e26dfc58203b4bb0fc0adb --- util-testing/org/cacert/gigi/util/SimpleSigner.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util-testing/org/cacert/gigi/util/SimpleSigner.java b/util-testing/org/cacert/gigi/util/SimpleSigner.java index 6b498988..9a2fb107 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; @@ -327,7 +328,8 @@ 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) { -- 2.39.2