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

[gigi.git] / src / club / wpia / gigi / pages / account / certs / CertificateDisplay.templ

diff --git a/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ b/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ
index 9aad7bcbd3eed7f573811ce4d9a8a7c954154394..e761a5b2a38c86e7790f1584ddcef1edef9e86a7 100644 (file)
--- a/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ
+++ b/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ
@@ -37,19 +37,20 @@
   </tr>
 <? } else { ?>
   <tr>
-    <td valign="top"><?=_Certificate and Chain?>:</td>
+    <td valign="top"><?=_Certificate and Chain?>*:</td>
     <td>
-        <a href='<?=$serial?>.crt'><?=_PEM encoded Certificate?></a>
+        <?=_PEM encoded Certificate?> (<a href='<?=$serial?>.crt' download>CRT</a>/<a href='<?=$serial?>.pem' download>PEM</a>)
         <? foreach($trustchain) { ?>
             <?=_issued by?> <a href='<?=$link?>'><?=$name?></a>
-        <? } ?>*<br/>
-        <a href='<?=$serial?>.crt?chain'><?=_PEM encoded Certificate Chain?></a><br/>
-        <a href='<?=$serial?>.crt?chain&noAnchor'><?=_PEM encoded Certificate Chain (Excluding Anchor)?></a><br/>
-        <a href='<?=$serial?>.crt?chain&noLeaf'><?=_PEM encoded Certificate Chain (Excluding Leaf)?></a><br/>
-        <a href='<?=$serial?>.cer'><?=_DER encoded Certificate?></a><br/>
+        <? } ?><br/>
+        <?=_PEM encoded Certificate Chain?> (<a href='<?=$serial?>.crt?chain'  download>CRT</a>/<a href='<?=$serial?>.pem?chain' download>PEM</a>)<br/>
+        <?=_PEM encoded Certificate Chain (Excluding Anchor)?> (<a href='<?=$serial?>.crt?chain&noAnchor' download>CRT</a>/<a href='<?=$serial?>.pem?chain&noAnchor' download>PEM</a>)<br/>
+        <?=_PEM encoded Certificate Chain (Excluding Leaf)?> (<a href='<?=$serial?>.crt?chain&noLeaf' download>CRT</a>/<a href='<?=$serial?>.pem?chain&noLeaf' download>PEM</a>)<br/>
+        <?=_DER encoded Certificate?> (<a href='<?=$serial?>.cer' download>CER</a>)<br/>
         <a href='<?=$serial?>.cer?install&chain'><?=_Install into browser.?></a><br/>
-        <a href='<?=$serial?>.cer?install'><?=_Install into browser (Chrome)?></a>. <?=_Please ensure that the intermediate certificates listed above are installed prior to installing the certificate.?>*<br/><br/>
-        * <?=_For information on how to install the root certificates into the truststore of your browser take a look at the !(/kb/CSR)FAQ!'</a>'!?>
+        <a href='<?=$serial?>.cer?install'><?=_Install into browser (Chrome)?></a>. <?=_Please ensure that the intermediate certificates listed above are installed prior to installing the certificate.?><br/><br/>
+        * <?=_For information on how to install the root certificates into the truststore of your browser take a look at the !(/kb/rootcert)root certificate page in the FAQ!'</a>'!?>.</br>
+        <?=_For the different variants of the certificate and chain take a look at the !(/kb/certs)certificate page in the FAQ!'</a>'!?>.
     </td>
   </tr>
 <? } ?>
@@ -83,10 +84,13 @@
   </tr>
 
   <tr>
-    <td><?=_Fingerprint?>:</td>
-    <td><?=$fingerprint?></td>
+    <td><?=_Fingerprint SHA-1?>:</td>
+    <td><?=$fingerprintSHA1?></td>
+  </tr>
+  <tr>
+    <td><?=_Fingerprint SHA-256?>:</td>
+    <td><?=$fingerprintSHA256?></td>
   </tr>
-
   <tr>
     <td valign="top"><?=_Certificate (PEM)?>:</td>
     <td><pre><?=$cert?></pre></td>