return false;
}
Certificate c = certificates[i++];
- vars.put("state", l.getTranslation(c.getStatus().toString().toLowerCase()));
+ vars.put("state", c.getStatus());
vars.put("CN", c.getDistinguishedName());
vars.put("serial", c.getSerial());
vars.put("digest", c.getMessageDigest());
vars.put("profile", c.getProfile().getVisibleName());
try {
CertificateStatus st = c.getStatus();
- vars.put("isNotRevoked", st != CertificateStatus.REVOKED);
+ vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED);
if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) {
X509Certificate cert = c.cert();
- vars.put("issued", DateSelector.getDateFormat().format(cert.getNotBefore()));
- vars.put("expire", DateSelector.getDateFormat().format(cert.getNotAfter()));
+ vars.put("issued", cert.getNotBefore());
+ vars.put("expire", cert.getNotAfter());
} else {
vars.put("issued", l.getTranslation("N/A"));
vars.put("expire", l.getTranslation("N/A"));
}
if (st == CertificateStatus.REVOKED) {
- vars.put("revoked", DateSelector.getDateFormat().format(c.getRevocationDate()));
+ vars.put("revoked", c.getRevocationDate());
} else {
vars.put("revoked", "n/a");
}