From 8bc416983f328a2058080a638670c464087bc6ba Mon Sep 17 00:00:00 2001
From: Christina Fu <cfu@redhat.com>
Date: Sun, 27 May 2012 14:58:11 -0700
Subject: Bug 823618 - TPS installation wizard (ECC): admin certificate panel
 needs to support ECC This patch allows TPS administrators to enroll for EC
 cert during installation wizard.  It follows the same implementation as the
 Java subsystems and defaults to nistp256

---
 .../shared/docroot/tps/admin/console/config/adminpanel.vm    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'dogtag')

diff --git a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
index 3d0843b67..aab1b764a 100644
--- a/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
@@ -35,13 +35,19 @@ function performPanel() {
     var dn = "cn=" + name + ",uid=admin,e="+email+",o="+o;
     document.forms[0].subject.value = dn;
     var keyGenAlg = "rsa-dual-use";
+    var keyParams = null;
+ 
+    if (document.forms[0].keytype.value == 'ecc') {
+        keyGenAlg = "ec-dual-use";
+        keyParams = "curve=nistp256"
+    }
 
     if (navigator.appName == "Netscape" &&
       typeof(crypto.version) != "undefined") {
 
         crmfObject = crypto.generateCRMFRequest(
           dn, "regToken", "authenticator", null,
-          "setCRMFRequest();", 1024, null, keyGenAlg);
+          "setCRMFRequest();", 2048, keyParams, keyGenAlg);
     } else {
         Send_OnClick();
     }
@@ -230,6 +236,10 @@ The administrator is a privileged user who manages this subsystem. Please enter
 <input type="hidden" name="securitydomain" value="$securityDomain" />
 <input type="hidden" name="subject" value="cn=x" />
       </tr>
+      <tr>
+        <th>Key Type:</th>
+        <td><select name="keytype"><option value="rsa">RSA</option><option value="ecc">ECC</option></select></td>
+      </tr>
     </table>
                                                                                      <div align="right">
       <hr />
-- 
cgit