From 72328c64659f06441c35dbd4f8cdcfd41376e7a3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 5 Nov 2015 11:37:10 +0100
Subject: [PATCH] Add a specific cert-download/install link for chrome

---
 .../cacert/gigi/pages/account/certs/CertificateDisplay.templ    | 1 +
 src/org/cacert/gigi/pages/account/certs/Certificates.java       | 2 +-
 tests/org/cacert/gigi/pages/account/TestCertificateAdd.java     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ b/src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ
index 1e66e85f..b2e93e8c 100644
--- a/src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ
@@ -6,6 +6,7 @@
 <a href='<?=$serial?>.crt?chain&noAnchor'><?=_PEM encoded Certificate Cain (Excluding Anchor)?></a><br/>
 <a href='<?=$serial?>.cer'><?=_DER encoded Certificate?></a><br/>
 <a href='<?=$serial?>.cer?install&chain'><?=_Install into browser.?></a><br/>
+<a href='<?=$serial?>.cer?install'><?=_Install into browser. (Chrome)?></a><br/>
 <pre>
 <?=$cert?>
 </pre>
diff --git a/src/org/cacert/gigi/pages/account/certs/Certificates.java b/src/org/cacert/gigi/pages/account/certs/Certificates.java
index d97c8b0a..923f1425 100644
--- a/src/org/cacert/gigi/pages/account/certs/Certificates.java
+++ b/src/org/cacert/gigi/pages/account/certs/Certificates.java
@@ -124,7 +124,7 @@ public class Certificates extends Page implements HandlesMixedRequest {
                     }
                 }
             } else if (cer) {
-                if (req.getParameter("install") != null) {
+                if (req.getParameter("chain") != null) {
                     PKCS7 p7 = toP7Chain(c);
                     p7.encodeSignedData(out);
                     /*
diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java
index 0b60cc84..38130bc4 100644
--- a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java
+++ b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java
@@ -139,7 +139,7 @@ public class TestCertificateAdd extends ClientTest {
         byte[] cer = IOUtils.readURL(uc.getInputStream());
         assertArrayEquals(cer, PEM.decode("CERTIFICATE", crt));
 
-        uc = authenticate(new URL(huc.getHeaderField("Location") + ".cer?install"));
+        uc = authenticate(new URL(huc.getHeaderField("Location") + ".cer?install&chain"));
         byte[] pkcs7 = IOUtils.readURL(uc.getInputStream());
         PKCS7 p7 = new PKCS7(pkcs7);
         byte[] sub = verifyChain(p7.getCertificates());
-- 
2.39.2