X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestCertificate.java;h=99dd03e8127f60d8f28891dcba84b8ba55a2cd6c;hb=a5c3e98a922e432d1ec2fd0b924045638c6c9376;hp=f686498976fd8470ede64e3038e58bbd93ca100b;hpb=7589c92feb7894372eae2e40aed79b3dba4775e6;p=gigi.git

diff --git a/tests/org/cacert/gigi/TestCertificate.java b/tests/org/cacert/gigi/TestCertificate.java
index f6864989..99dd03e8 100644
--- a/tests/org/cacert/gigi/TestCertificate.java
+++ b/tests/org/cacert/gigi/TestCertificate.java
@@ -2,6 +2,7 @@ package org.cacert.gigi;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
+import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import java.sql.SQLException;
@@ -9,68 +10,68 @@ import java.sql.SQLException;
 import org.cacert.gigi.Certificate.CSRType;
 import org.cacert.gigi.Certificate.CertificateStatus;
 import org.cacert.gigi.testUtils.ManagedTest;
-import org.cacert.gigi.testUtils.PemKey;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 
 public class TestCertificate extends ManagedTest {
-	@Test
-	public void testClientCertLoginStates() throws IOException, GeneralSecurityException, SQLException,
-		InterruptedException {
-		String[] key1 = generateCSR("/CN=testmail@example.com");
-		Certificate c = new Certificate(1, "/CN=testmail@example.com", "sha256", key1[1], CSRType.CSR);
-		final PrivateKey pk = PemKey.parsePEMPrivateKey(key1[0]);
-		c.issue().waitFor(60000);
-		final X509Certificate ce = c.cert();
-		assertNotNull(login(pk, ce));
-	}
 
-	@Test
-	public void testCertLifeCycle() throws IOException, GeneralSecurityException, SQLException, InterruptedException {
-		String[] key1 = generateCSR("/CN=testmail@example.com");
-		Certificate c = new Certificate(1, "/CN=testmail@example.com", "sha256", key1[1], CSRType.CSR);
-		final PrivateKey pk = PemKey.parsePEMPrivateKey(key1[0]);
+    @Test
+    public void testClientCertLoginStates() throws IOException, GeneralSecurityException, SQLException, InterruptedException {
+        KeyPair kp = generateKeypair();
+        String key1 = generatePEMCSR(kp, "CN=testmail@example.com");
+        Certificate c = new Certificate(1, "/CN=testmail@example.com", "sha256", key1, CSRType.CSR);
+        final PrivateKey pk = kp.getPrivate();
+        c.issue().waitFor(60000);
+        final X509Certificate ce = c.cert();
+        assertNotNull(login(pk, ce));
+    }
 
-		testFails(CertificateStatus.DRAFT, c);
-		c.issue().waitFor(60000);
+    @Test
+    public void testCertLifeCycle() throws IOException, GeneralSecurityException, SQLException, InterruptedException {
+        KeyPair kp = generateKeypair();
+        String key = generatePEMCSR(kp, "CN=testmail@example.com");
+        Certificate c = new Certificate(1, "/CN=testmail@example.com", "sha256", key, CSRType.CSR);
+        final PrivateKey pk = kp.getPrivate();
 
-		testFails(CertificateStatus.ISSUED, c);
-		X509Certificate cert = c.cert();
-		assertNotNull(login(pk, cert));
-		c.revoke().waitFor(60000);
+        testFails(CertificateStatus.DRAFT, c);
+        c.issue().waitFor(60000);
 
-		testFails(CertificateStatus.REVOKED, c);
-		assertNull(login(pk, cert));
+        testFails(CertificateStatus.ISSUED, c);
+        X509Certificate cert = c.cert();
+        assertNotNull(login(pk, cert));
+        c.revoke().waitFor(60000);
 
-	}
+        testFails(CertificateStatus.REVOKED, c);
+        assertNull(login(pk, cert));
 
-	private void testFails(CertificateStatus status, Certificate c) throws IOException, GeneralSecurityException,
-		SQLException {
-		assertEquals(status, c.getStatus());
-		if (status != CertificateStatus.ISSUED) {
-			try {
-				c.revoke();
-				fail(status + " is in invalid state");
-			} catch (IllegalStateException ise) {
+    }
 
-			}
-		}
-		if (status != CertificateStatus.DRAFT) {
-			try {
-				c.issue();
-				fail(status + " is in invalid state");
-			} catch (IllegalStateException ise) {
+    private void testFails(CertificateStatus status, Certificate c) throws IOException, GeneralSecurityException, SQLException {
+        assertEquals(status, c.getStatus());
+        if (status != CertificateStatus.ISSUED) {
+            try {
+                c.revoke();
+                fail(status + " is in invalid state");
+            } catch (IllegalStateException ise) {
 
-			}
-		}
-		if (status != CertificateStatus.ISSUED) {
-			try {
-				c.cert();
-				fail(status + " is in invalid state");
-			} catch (IllegalStateException ise) {
+            }
+        }
+        if (status != CertificateStatus.DRAFT) {
+            try {
+                c.issue();
+                fail(status + " is in invalid state");
+            } catch (IllegalStateException ise) {
 
-			}
-		}
-	}
+            }
+        }
+        if (status != CertificateStatus.ISSUED) {
+            try {
+                c.cert();
+                fail(status + " is in invalid state");
+            } catch (IllegalStateException ise) {
+
+            }
+        }
+    }
 }