import javax.servlet.http.HttpServletRequest;
-import org.cacert.gigi.Certificate;
-import org.cacert.gigi.Certificate.CSRType;
-import org.cacert.gigi.Certificate.SANType;
-import org.cacert.gigi.Certificate.SubjectAlternateName;
-import org.cacert.gigi.CertificateProfile;
-import org.cacert.gigi.Digest;
import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
import org.cacert.gigi.crypto.SPKAC;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.CertificateProfile;
+import org.cacert.gigi.dbObjects.Digest;
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.dbObjects.Certificate.CSRType;
+import org.cacert.gigi.dbObjects.Certificate.SANType;
+import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.CertificateValiditySelector;
import org.cacert.gigi.output.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<SubjectAlternateName> SANs = new LinkedHashSet<>();
+ private Set<SubjectAlternateName> 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);
spkacChallenge = RandomToken.generateToken(16);
}
- Certificate result;
+ private Certificate result;
public Certificate getResult() {
return result;
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) {