upd: improve digest explanation and make SHA512 default

[gigi.git] / tests / org / cacert / gigi / testUtils / ConfiguredTest.java

diff --git a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
index 892dfefee9f48bdf45de91be5fa01fadb6aeed53..c3d67b9a5e73de1f0f07da3fb3e7378db1d16517 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
+++ b/tests/org/cacert/gigi/testUtils/ConfiguredTest.java
@@ -28,6 +28,7 @@ import org.cacert.gigi.database.DatabaseConnection.Link;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.SQLFileManager.ImportType;
 import org.cacert.gigi.dbObjects.CATS.CATSType;
+import org.cacert.gigi.dbObjects.CertificateProfile;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.DomainPingType;
 import org.cacert.gigi.dbObjects.User;
@@ -39,6 +40,7 @@ import org.cacert.gigi.util.PEM;
 import org.cacert.gigi.util.PasswordHash;
 import org.cacert.gigi.util.ServerConstants;
 import org.cacert.gigi.util.TimeConditions;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
 import sun.security.pkcs10.PKCS10;
@@ -71,6 +73,8 @@ public abstract class ConfiguredTest {
         initEnvironment();
     }
 
+    private static Link l;
+
     public static Properties initEnvironment() throws IOException {
         TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
         if (envInited) {
@@ -94,8 +98,16 @@ public abstract class ConfiguredTest {
                 throw new Error(e);
             }
         }
+
         return props;
+    }
 
+    @AfterClass
+    public static void closeDBLink() {
+        if (l != null) {
+            l.close();
+            l = null;
+        }
     }
 
     private static Properties generateProps() throws Error {
@@ -151,7 +163,7 @@ public abstract class ConfiguredTest {
     }
 
     public static String generatePEMCSR(KeyPair kp, String dn, PKCS10Attributes atts) throws GeneralSecurityException, IOException {
-        return generatePEMCSR(kp, dn, atts, "SHA256WithRSA");
+        return generatePEMCSR(kp, dn, atts, "SHA512WithRSA");
     }
 
     public static String generatePEMCSR(KeyPair kp, String dn, PKCS10Attributes atts, String signature) throws GeneralSecurityException, IOException {
@@ -164,8 +176,6 @@ public abstract class ConfiguredTest {
 
     static int count = 0;
 
-    private static Link l;
-
     public static String createRandomIDString() {
         final char[] chars = "abcdefghijklmnopqrstuvwxyz0123456789".toCharArray();
         final int idStringLength = 16;
@@ -185,6 +195,10 @@ public abstract class ConfiguredTest {
         return "test" + createRandomIDString() + "a" + (count++) + "u";
     }
 
+    public static CertificateProfile getClientProfile() {
+        return CertificateProfile.getByName("client");
+    }
+
     public static int countRegex(String text, String pattern) {
         Pattern p = Pattern.compile(pattern);
         Matcher m = p.matcher(text);
@@ -246,5 +260,4 @@ public abstract class ConfiguredTest {
         c.add(Calendar.MONTH, -Notary.LIMIT_MAX_MONTHS_VERIFICATION + 1);
         return sdf.format(new Date(c.getTimeInMillis()));
     }
-
 }