Merge "fix: general cleanup. Remove CipherInfo as it is not compatible with java-11"

[gigi.git] / src / club / wpia / gigi / pages / RootCertPage.java

diff --git a/src/club/wpia/gigi/pages/RootCertPage.java b/src/club/wpia/gigi/pages/RootCertPage.java
index b065463d971f075a1e1cde81de4e868a0b183b51..ffde0966d16450edad2d392d94f630bb20397a24 100644 (file)
--- a/src/club/wpia/gigi/pages/RootCertPage.java
+++ b/src/club/wpia/gigi/pages/RootCertPage.java
@@ -62,7 +62,7 @@ public class RootCertPage extends Page {
 
         @Override
         public void output(PrintWriter out, Language l, Map<String, Object> vars) {
-            out.println("<a href='" + HTMLEncoder.encodeHTML(target.getLink()) + "'>");
+            out.println("<a href='" + HTMLEncoder.encodeHTML(target.getLink()) + "' download='" + HTMLEncoder.encodeHTML(target.getKeyname()) + "'>");
             out.println(HTMLEncoder.encodeHTML(target.getKeyname()));
             out.println("</a>");
             out.println(HTMLEncoder.encodeHTML(target.getCertificate().getSubjectX500Principal().toString()));
@@ -143,13 +143,19 @@ public class RootCertPage extends Page {
         Map<String, Object> map = Page.getDefaultVars(req);
         map.put("root", rootP);
         map.put("bundle", appName + "_intermediate_bundle.p7b");
-        getDefaultTemplate().output(resp.getWriter(), getLanguage(req), map);
 
+        try {
+            map.put("fingerprintSHA1", rootP.target.getFingerprint("sha-1"));
+            map.put("fingerprintSHA256", rootP.target.getFingerprint("sha-256"));
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+        }
+
+        getDefaultTemplate().output(resp.getWriter(), getLanguage(req), map);
     }
 
     @Override
     public boolean needsLogin() {
         return false;
     }
-
 }