Bugzilla Bug 223336 - ECC: unable to clone a ECC CA

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

5 files changed, 37 insertions, 6 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
index 129bc0bf6..4077559ef 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
@@ -230,7 +230,10 @@ public class AdminAuthenticatePanel extends WizardPanelBase {
                 c1.append(".pubkey.exponent,");
                 c1.append("cloning.");
                 c1.append(t1);
-                c1.append(".pubkey.modulus");
+                c1.append(".pubkey.modulus,");
+                c1.append("cloning.");
+                c1.append(t1);
+                c1.append(".pubkey.encoded");
                 
                 if (s1.length()!=0)
                     s1.append(",");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
index bae3745ee..21a91c167 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
@@ -390,8 +390,9 @@ public class CertUtil {
 
             String caPriKeyID = config.getString(
                     prefix + "signing" + ".privkey.id");
-            org.mozilla.jss.crypto.PrivateKey caPrik = CryptoUtil.findPrivateKeyFromID(
-                    CryptoUtil.string2byte(caPriKeyID));
+            byte[] keyIDb = CryptoUtil.string2byte(caPriKeyID);
+            PrivateKey caPrik = CryptoUtil.findPrivateKeyFromID(
+                    keyIDb);
 
             if( caPrik == null ) {
                 CMS.debug( "CertUtil::createSelfSignedCert() - "
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
index 843616822..864bcaf80 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
@@ -530,6 +530,7 @@ public class DonePanel extends WizardPanelBase {
                 cs.putString("cloning." + ss + ".privkey.id", cs.getString("preop.cert." + ss + ".privkey.id", ""));
                 cs.putString("cloning." + ss + ".pubkey.exponent", cs.getString("preop.cert." + ss + ".pubkey.exponent", ""));
                 cs.putString("cloning." + ss + ".pubkey.modulus", cs.getString("preop.cert." + ss + ".pubkey.modulus", ""));
+                cs.putString("cloning." + ss + ".pubkey.encoded", cs.getString("preop.cert." + ss + ".pubkey.encoded", ""));
             }
             cs.putString("cloning.module.token", cs.getString("preop.module.token", ""));
             cs.putString("cloning.list", list);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
index 475ac46d2..190fa1baf 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
@@ -400,7 +400,11 @@ public class RestoreKeyCertPanel extends WizardPanelBase {
                     c1.append(".pubkey.exponent,");
                     c1.append("cloning.");
                     c1.append(t1);
-                    c1.append(".pubkey.modulus");
+                    c1.append(".pubkey.modulus,");
+                    c1.append("cloning.");
+                    c1.append(t1);
+                    c1.append(".pubkey.encoded");
+
 
                     if (s1.length()!=0)
                         s1.append(",");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
index a3872f713..be142124f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
@@ -572,6 +572,13 @@ public class WizardPanelBase implements IWizardPanel {
                 CMS.debug("WizardPanelBase updateConfigEntries: status=" + status);
 
                 if (status.equals(SUCCESS)) {
+                    String cstype = "";
+                    try {
+                        cstype = config.getString("cs.type", "");
+                    } catch (Exception e) {
+                        CMS.debug("WizardPanelBase::updateConfigEntries() - unable to get cs.type: " + e.toString());
+                    }
+              
                     Document doc = parser.getDocument(); 
                     NodeList list = doc.getElementsByTagName("name");
                     int len = list.getLength();
@@ -632,10 +639,25 @@ public class WizardPanelBase implements IWizardPanel {
                             config.putString(name, v);
                         } else if (name.startsWith("cloning.ca")) {
                             config.putString(name.replaceFirst("cloning", "preop"), v);
+                        } else if (name.equals("cloning.signing.keyalgorithm")) {
+                            config.putString(name.replaceFirst("cloning", "preop.cert"), v);
+                            if (cstype.equals("CA")) {
+                                config.putString("ca.crl.MasterCRL.signingAlgorithm", v);
+                                config.putString("ca.signing.defaultSigningAlgorithm", v);
+                            } else if (cstype.equals("OCSP")) {
+                                config.putString("ocsp.signing.defaultSigningAlgorithm", v);
+                            }
+                        } else if (name.equals("cloning.transport.keyalgorithm")) {
+                            config.putString(name.replaceFirst("cloning", "preop.cert"), v);
+                            config.putString("kra.transportUnit.signingAlgorithm", v);
+                        } else if (name.equals("cloning.ocsp_signing.keyalgorithm")) {
+                            config.putString(name.replaceFirst("cloning", "preop.cert"), v);
+                            if (cstype.equals("CA")) {
+                                config.putString("ca.ocsp_signing.defaultSigningAlgorithm", v);
+                            }
                         } else if (name.startsWith("cloning")) {
                             config.putString(name.replaceFirst("cloning", "preop.cert"), v);
-                        }
-                        else {
+                        } else {
                             config.putString(name, v);
                         }
                     }