upd: cleanup CertificateRequest.update

Change-Id: Ida3f1cd85b0777877249b2536b5f565c727dac20

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
index 672b28f9a03501eca9fc1a5df80cf57278ada5d4..c32fc716f050f3972edd59df68a882d446d140f0 100644 (file)
--- 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 ad915d7da370f4b0163ed456a38bc4539a9431fb..12204688d2fdc5c9c58c8fbe8474e75d227d5703 100644 (file)
--- 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 57d481d842e7536fa486f240a045f761894c47f9..98f105f0995427570cbb637a9ee3b7ec006772d5 100644 (file)
--- 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 3d42e3e76197d82c9553fbaa300099085002337b..1b4c3953dc46ea74f34ba71a517521bee7c9e2ed 100644 (file)
--- 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 a3838facdfc8041985abd37762ac3559a9a6aa6d..6a3f4196e028a25194b89ba37113462ff945883c 100644 (file)
--- 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) {