X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2Fcerts%2FCertificateIssueForm.java;h=eecb31fe786a5e7373ee7445462af5e5446661c2;hb=d0ee991d9ba982e43acd036c2d0592976ba9e9ff;hp=a3e4b80fc91616b3460c811193899b234286bbe9;hpb=5696c41e3591e5b20cdb7a6637e87e3833b23e66;p=gigi.git diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java index a3e4b80f..eecb31fe 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java +++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java @@ -75,13 +75,11 @@ 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); } - if (req.getParameter("tos_agree") == null) { - error.mergeInto(new GigiApiException("You need to accept the ToS.")); - } + Certificate result = null; try { result = cr.draft(); @@ -106,8 +104,6 @@ public class CertificateIssueForm extends Form { } catch (GeneralSecurityException e) { e.printStackTrace(); throw new GigiApiException("Certificate Request format is invalid."); - } catch (InterruptedException e) { - e.printStackTrace(); } } catch (GigiApiException e) { e.format(out, Page.getLanguage(req)); @@ -132,7 +128,6 @@ public class CertificateIssueForm extends Form { @Override protected void outputContent(PrintWriter out, Language l, Map vars) { HashMap vars2 = new HashMap(vars); - vars2.put("ToS", "ToS"); StringBuffer content = new StringBuffer(); for (SubjectAlternateName SAN : cr.getSANs()) {