X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestCrossDomainAccess.java;h=e04235e532ad972e9dfdd420dd6b3c1d457ab7ae;hb=6d7ab9c4e2807bc40e7c583f899b5221cf44c8ea;hp=7e0a4f4e498f515152e5a63211bacdcd26421157;hpb=ab9bfb07d8f4d8029a4372f1bbdde51f888c17ac;p=gigi.git diff --git a/tests/org/cacert/gigi/TestCrossDomainAccess.java b/tests/org/cacert/gigi/TestCrossDomainAccess.java index 7e0a4f4e..e04235e5 100644 --- a/tests/org/cacert/gigi/TestCrossDomainAccess.java +++ b/tests/org/cacert/gigi/TestCrossDomainAccess.java @@ -15,6 +15,7 @@ import java.sql.SQLException; import org.cacert.gigi.dbObjects.Certificate; import org.cacert.gigi.dbObjects.Certificate.CSRType; import org.cacert.gigi.dbObjects.CertificateProfile; +import org.cacert.gigi.dbObjects.Digest; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.testUtils.IOUtils; import org.cacert.gigi.testUtils.ManagedTest; @@ -48,9 +49,9 @@ public class TestCrossDomainAccess extends ManagedTest { User u = User.getById(createVerifiedUser("fn", "ln", "testmail@example.com", TEST_PASSWORD)); KeyPair kp = generateKeypair(); String key = generatePEMCSR(kp, "CN=testmail@example.com"); - Certificate c = new Certificate(u, Certificate.buildDN("CN", "testmail@example.com"), "sha256", key, CSRType.CSR, CertificateProfile.getById(1)); + Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "testmail@example.com"), Digest.SHA256, key, CSRType.CSR, CertificateProfile.getById(1)); final PrivateKey pk = kp.getPrivate(); - c.issue(null, "2y").waitFor(60000); + await(c.issue(null, "2y", u)); URLConnection con = new URL("https://" + ServerConstants.getSecureHostNamePort()).openConnection(); authenticateClientCert(pk, c.cert(), (HttpURLConnection) con);