X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FCertificateIterable.java;h=8bfff7ef7a7c4819f92413f6619c6d6948d1cbfb;hb=2befeb9fa40cd353f3a4c8fef355d619e8fadf93;hp=14a62130d0ce64b2a998ace84b0741823c065abb;hpb=95840660b28dce27a38ed7de0b66634ec7f38ba2;p=gigi.git

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index 14a62130..8bfff7ef 100644
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -33,21 +33,25 @@ public class CertificateIterable implements IterableDataset {
         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", c.getRevocationDate());
+            } else {
+                vars.put("revoked", "n/a");
+            }
         } catch (IOException e) {
             e.printStackTrace();
         } catch (GeneralSecurityException e) {
             e.printStackTrace();
         }
-        vars.put("revoked", "TODO");// TODO output date
         return true;
     }
 }