From 1e1e5b741b623440c756c0b7e2fa14a5ccecb874 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Mon, 11 Jul 2016 12:25:13 +0200 Subject: [PATCH] upd: cleanup CertificateRequest.update Change-Id: Ida3f1cd85b0777877249b2536b5f565c727dac20 --- .../cacert/gigi/pages/account/certs/CertificateIssueForm.java | 2 +- .../cacert/gigi/pages/account/certs/CertificateRequest.java | 4 +--- .../org/cacert/gigi/pages/account/TestCertificateRequest.java | 4 ++-- tests/org/cacert/gigi/util/TestCAAValidation.java | 2 +- util-testing/org/cacert/gigi/pages/Manager.java | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java index 672b28f9..c32fc716 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java +++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java @@ -75,7 +75,7 @@ public class CertificateIssueForm extends Form { try { cr.update(req.getParameter("CN"), req.getParameter("hash_alg"), req.getParameter("profile"), // - req.getParameter("org"), req.getParameter("OU"), req.getParameter("SANs"), out, req); + req.getParameter("org"), req.getParameter("OU"), req.getParameter("SANs")); } catch (GigiApiException e) { error.mergeInto(e); } diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java index ad915d7d..12204688 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java +++ b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java @@ -14,8 +14,6 @@ import java.util.LinkedHashSet; import java.util.Set; import java.util.TreeSet; -import javax.servlet.http.HttpServletRequest; - import org.cacert.gigi.GigiApiException; import org.cacert.gigi.crypto.SPKAC; import org.cacert.gigi.dbObjects.Certificate; @@ -300,7 +298,7 @@ public class CertificateRequest { return profile; } - public synchronized boolean update(String nameIn, String hashAlg, String profileStr, String newOrgStr, String ou, String SANsStr, PrintWriter out, HttpServletRequest req) throws GigiApiException { + public synchronized boolean update(String nameIn, String hashAlg, String profileStr, String newOrgStr, String ou, String SANsStr) throws GigiApiException { GigiApiException error = new GigiApiException(); this.name = nameIn; if (hashAlg != null) { diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java b/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java index 57d481d8..98f105f0 100644 --- a/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java +++ b/tests/org/cacert/gigi/pages/account/TestCertificateRequest.java @@ -64,7 +64,7 @@ public class TestCertificateRequest extends ClientTest { try { u.grantGroup(u, Group.CODESIGNING); CertificateRequest cr = new CertificateRequest(ac, generatePEMCSR(kp, "CN=a ab")); - cr.update("name", "SHA512", "code-a", null, null, "email:" + email, null, null); + cr.update("name", "SHA512", "code-a", null, null, "email:" + email); cr.draft(); fail(); } catch (GigiApiException e) { @@ -78,7 +78,7 @@ public class TestCertificateRequest extends ClientTest { public void testCodesignNoPermModifiedName() throws Exception { try { CertificateRequest cr = new CertificateRequest(ac, generatePEMCSR(kp, "CN=a ab")); - cr.update("name", "SHA512", "code-a", null, null, "email:" + email, null, null); + cr.update("name", "SHA512", "code-a", null, null, "email:" + email); cr.draft(); fail(); } catch (GigiApiException e) { diff --git a/tests/org/cacert/gigi/util/TestCAAValidation.java b/tests/org/cacert/gigi/util/TestCAAValidation.java index 3d42e3e7..1b4c3953 100644 --- a/tests/org/cacert/gigi/util/TestCAAValidation.java +++ b/tests/org/cacert/gigi/util/TestCAAValidation.java @@ -64,7 +64,7 @@ public class TestCAAValidation extends ClientTest { String csr = generatePEMCSR(generateKeypair(), "CN=test"); CertificateRequest cr = new CertificateRequest(new AuthorizationContext(u, u), csr); try { - cr.update("", Digest.SHA512.toString(), "server", null, null, "dns:" + domain + "\n", null, null); + cr.update("", Digest.SHA512.toString(), "server", null, null, "dns:" + domain + "\n"); } catch (GigiApiException e) { assertThat(e.getMessage(), containsString("has been removed")); assertFalse(success); diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java index a3838fac..6a3f4196 100644 --- a/util-testing/org/cacert/gigi/pages/Manager.java +++ b/util-testing/org/cacert/gigi/pages/Manager.java @@ -310,7 +310,7 @@ public class Manager extends Page { byte[] res = s.getEncoded(sign); CertificateRequest cr = new CertificateRequest(new AuthorizationContext(u, u), Base64.getEncoder().encodeToString(res), "challange"); - cr.update(CertificateRequest.DEFAULT_CN, Digest.SHA512.toString(), "client", null, "", "email:" + u.getEmail(), resp.getWriter(), req); + cr.update(CertificateRequest.DEFAULT_CN, Digest.SHA512.toString(), "client", null, "", "email:" + u.getEmail()); Certificate draft = cr.draft(); draft.issue(null, "2y", u).waitFor(10000); if (draft.getStatus() == CertificateStatus.ISSUED) { -- 2.39.2