Bugzilla Bug 451874 - RFE - Java console - Certificate Wizard missing e.c. support

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1473 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

3 files changed, 117 insertions, 1 deletions

diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java b/pki/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
index be76ef68f..ce0ced102 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
@@ -41,9 +41,11 @@ import com.netscape.management.client.util.*;
  * @see com.netscape.admin.certsrv.config.install
  */
 public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel {
-    protected JComboBox mRSAHashTypeBox, mDSAHashTypeBox;
+    protected JComboBox mRSAHashTypeBox, mDSAHashTypeBox, mECCHashTypeBox;
+    protected JComboBox mRSASignedByTypeBox, mDSASignedByTypeBox, mECCSignedByTypeBox;
     protected String mHelpIndex;
     protected String mCAKeyType;
+    protected JTextArea mSignedByTypeLbl;
     private static final String HELPINDEX = "install-cert-mda-wizard-help";
     
     public WMessageDigestPage(String panelName) {
@@ -60,11 +62,17 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel
         setBorder(makeTitledBorder(mPanelName));
 
         if (mCAKeyType.equals("RSA")) {
+            mECCHashTypeBox.setVisible(false); 
             mDSAHashTypeBox.setVisible(false);
             mRSAHashTypeBox.setVisible(true);
             String sha1 = mResource.getString(mPanelName+"_COMBOBOX_RSAHASHTYPE_VALUE_2");
             mRSAHashTypeBox.setSelectedItem(sha1);
+        } else if (mCAKeyType.equals("ECC")) {
+            mECCHashTypeBox.setVisible(true); 
+            mDSAHashTypeBox.setVisible(false);
+            mRSAHashTypeBox.setVisible(false);
         } else {
+            mECCHashTypeBox.setVisible(false); 
             mDSAHashTypeBox.setVisible(true);
             mRSAHashTypeBox.setVisible(false);
         }
@@ -77,6 +85,33 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel
         return true;
     }
 
+    public void enableSignedByFields(boolean enable) {
+        if (!enable) {
+            mRSASignedByTypeBox.setVisible(false);
+            mDSASignedByTypeBox.setVisible(false);
+            mECCSignedByTypeBox.setVisible(false);
+            mSignedByTypeLbl.setVisible(false);
+            return;
+        }
+ 
+        if (mCAKeyType.equals("RSA")) {
+            mRSASignedByTypeBox.setVisible(true);
+            mDSASignedByTypeBox.setVisible(false);
+            mECCSignedByTypeBox.setVisible(false);
+        } else if (mCAKeyType.equals("ECC")) {
+            mRSASignedByTypeBox.setVisible(false);
+            mDSASignedByTypeBox.setVisible(false);
+            mECCSignedByTypeBox.setVisible(true);
+        } else {
+            mECCSignedByTypeBox.setVisible(false);
+            mDSASignedByTypeBox.setVisible(true);
+            mRSASignedByTypeBox.setVisible(false);
+        }
+        
+        mSignedByTypeLbl.setVisible(true);
+    }
+
+
     public boolean concludePanel(WizardInfo info) {
         return true;
     }
@@ -108,6 +143,7 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel
         gbc.insets = new Insets(0, 4*COMPONENT_SPACE, COMPONENT_SPACE,
           COMPONENT_SPACE);
         gbc.fill = gbc.NONE;
+        gbc.gridwidth = gbc.REMAINDER;
         add(mRSAHashTypeBox, gbc);
 
         mDSAHashTypeBox = makeJComboBox("DSAHASHTYPE");
@@ -117,8 +153,19 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel
         gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,
           COMPONENT_SPACE);
         gbc.fill = gbc.NONE;
+        gbc.gridwidth = gbc.REMAINDER;
         add(mDSAHashTypeBox, gbc);
 
+        mECCHashTypeBox = makeJComboBox("ECCHASHTYPE");
+        mECCHashTypeBox.setVisible(false);
+        CMSAdminUtil.resetGBC(gbc);
+        gbc.anchor = gbc.NORTHWEST;
+        gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,
+          COMPONENT_SPACE);
+        gbc.fill = gbc.NONE;
+        gbc.gridwidth = gbc.REMAINDER;
+        add(mECCHashTypeBox, gbc);
+
         JLabel dummy = new JLabel(" ");
         CMSAdminUtil.resetGBC(gbc);
         gbc.anchor = gbc.WEST;
@@ -127,6 +174,55 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel
         gbc.insets = new Insets(0, 0,COMPONENT_SPACE, COMPONENT_SPACE);
         add(dummy, gbc);
 
+        JLabel dummy2 = new JLabel(" ");
+        CMSAdminUtil.resetGBC(gbc);
+        gbc.anchor = gbc.WEST;
+        gbc.gridwidth = gbc.REMAINDER;
+        gbc.weightx = 1.0;
+        gbc.insets = new Insets(0, 0,COMPONENT_SPACE, COMPONENT_SPACE);
+        add(dummy2, gbc);
+
+        mSignedByTypeLbl = createTextArea(mResource.getString(
+          mPanelName+"_TEXT_SIGNEDBYTYPE_LABEL"));
+        CMSAdminUtil.resetGBC(gbc);
+        gbc.anchor = gbc.NORTHWEST;
+        gbc.weightx = 1.0;
+        gbc.weighty = 0.0;
+        gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE,
+          COMPONENT_SPACE,COMPONENT_SPACE);
+        gbc.gridwidth = gbc.REMAINDER;
+        add(mSignedByTypeLbl, gbc);
+
+        mRSASignedByTypeBox = makeJComboBox("RSASIGNEDBYTYPE");
+        mRSASignedByTypeBox.setVisible(true);
+        CMSAdminUtil.resetGBC(gbc);
+        gbc.anchor = gbc.NORTHWEST;
+        gbc.insets = new Insets(0, 4*COMPONENT_SPACE, COMPONENT_SPACE,
+          COMPONENT_SPACE);
+        gbc.fill = gbc.NONE;
+        gbc.gridwidth = gbc.REMAINDER;
+        add(mRSASignedByTypeBox, gbc);
+
+        mDSASignedByTypeBox = makeJComboBox("DSASIGNEDBYTYPE");
+        mDSASignedByTypeBox.setVisible(false);
+        CMSAdminUtil.resetGBC(gbc);
+        gbc.anchor = gbc.NORTHWEST;
+        gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,
+          COMPONENT_SPACE);
+        gbc.fill = gbc.NONE;
+        gbc.gridwidth = gbc.REMAINDER;
+        add(mDSASignedByTypeBox, gbc);
+
+        mECCSignedByTypeBox = makeJComboBox("ECCSIGNEDBYTYPE");
+        mECCSignedByTypeBox.setVisible(false);
+        CMSAdminUtil.resetGBC(gbc);
+        gbc.anchor = gbc.NORTHWEST;
+        gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,
+          COMPONENT_SPACE);
+        gbc.fill = gbc.NONE;
+        gbc.gridwidth = gbc.REMAINDER;
+        add(mECCSignedByTypeBox, gbc);
+
         JLabel dummy1 = new JLabel(" ");
         CMSAdminUtil.resetGBC(gbc);
         gbc.anchor = gbc.CENTER;
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java b/pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java
index a081bdd3d..a88101cc4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java
@@ -833,6 +833,17 @@ public class InstallWizardInfo extends WizardInfo {
         return val;
     }
 
+    public String getKeyCurveName() {
+        String val = (String)get(ConfigConstants.PR_KEY_CURVENAME);
+        if (val ==null) 
+            val = "nistp521";
+        return val;
+    }
+
+    public void setKeyCurveName(String val) {
+        put(ConfigConstants.PR_KEY_CURVENAME, val);
+    }
+
     public String getKeyType() {
         String type = (String)get(ConfigConstants.PR_KEY_TYPE);
 		// work around the historical mistake,
@@ -1405,6 +1416,14 @@ public class InstallWizardInfo extends WizardInfo {
         put(ConfigConstants.PR_HASH_TYPE, type);
     }
 
+    public String getSignedByType() {
+        return (String)get(ConfigConstants.PR_SIGNEDBY_TYPE);
+    }
+
+    public void setSignedByType(String type) {
+        put(ConfigConstants.PR_SIGNEDBY_TYPE, type);
+    }
+
     public String getCAKeyType() {
         return (String)get(ConfigConstants.PR_CA_KEYTYPE);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java b/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
index 9611be01c..7ba0636fd 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
@@ -92,6 +92,7 @@ class WICertExtensionPage extends WBaseCertExtensionPage implements
             nvps.add(Constants.PR_TOKEN_NAME, wizardInfo.getTokenName());
             nvps.add(Constants.PR_KEY_LENGTH, wizardInfo.getKeyLength());
             nvps.add(Constants.PR_KEY_TYPE, wizardInfo.getKeyType());
+            nvps.add(Constants.PR_KEY_CURVENAME, wizardInfo.getKeyCurveName());
             addValidityPeriod(wizardInfo, nvps);
 
             if (mBasicCheckBox.isSelected())