X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FCertificateIssueForm.java;h=ff659225976a77a21106597e1ea23cf4e8655382;hp=4c56dbdf1737e11dac45e50ef7fcea786783f265;hb=d895448cb685adc4c2bfac8d92759252d2ce8c36;hpb=25310a5d257de7c257e270b5ce467b9ac42a3498 diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java index 4c56dbdf..ff659225 100644 --- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java +++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java @@ -95,25 +95,25 @@ public class CertificateIssueForm extends Form { 1, 3, 6, 1, 5, 5, 7, 3, 9 }); - User u; + private User u; private CSRType csrType; - String csr; + private String csr; - String spkacChallenge; + private String spkacChallenge; public String CN = DEFAULT_CN; - Set SANs = new LinkedHashSet<>(); + private Set SANs = new LinkedHashSet<>(); - Digest selectedDigest = Digest.getDefault(); + private Digest selectedDigest = Digest.getDefault(); CertificateValiditySelector issueDate = new CertificateValiditySelector(); - boolean login; + private boolean login; - CertificateProfile profile = CertificateProfile.getById(1); + private CertificateProfile profile = CertificateProfile.getById(1); public CertificateIssueForm(HttpServletRequest hsr) { super(hsr); @@ -121,7 +121,7 @@ public class CertificateIssueForm extends Form { spkacChallenge = RandomToken.generateToken(16); } - Certificate result; + private Certificate result; public Certificate getResult() { return result; @@ -300,7 +300,7 @@ public class CertificateIssueForm extends Form { result = new Certificate(LoginPage.getUser(req).getId(), subject.toString(), selectedDigest.toString(), // this.csr, this.csrType, profile, SANs.toArray(new SubjectAlternateName[SANs.size()])); - result.issue().waitFor(60000); + result.issue(issueDate.getFrom(), issueDate.getTo()).waitFor(60000); return true; } } catch (IOException e) {