diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/csadmin')
17 files changed, 42 insertions, 100 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 b8cc8022e..585d444d4 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 @@ -27,8 +27,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.velocity.context.Context; import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.crypto.CryptoStore; -import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.X509Certificate; import com.netscape.certsrv.apps.CMS; @@ -310,8 +308,7 @@ public class AdminAuthenticatePanel extends WizardPanelBase { while (st.hasMoreTokens()) { String token = st.nextToken(); String tokenname = config.getString("preop.module.token", ""); - CryptoToken tok = cm.getTokenByName(tokenname); - CryptoStore store = tok.getCryptoStore(); + cm.getTokenByName(tokenname); // throw exception on error String name1 = "preop.master." + token + ".nickname"; String nickname = config.getString(name1, ""); if (!tokenname.equals("Internal Key Storage Token") && diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java index 4e73b8369..1f5a3327c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java @@ -149,10 +149,8 @@ public class AdminPanel extends WizardPanelBase { String info = ""; context.put("import", "true"); - String subsystemtype = ""; try { type = cs.getString("preop.ca.type", ""); - subsystemtype = cs.getString("cs.type", ""); } catch (Exception e) { } @@ -254,12 +252,10 @@ public class AdminPanel extends WizardPanelBase { String type = ""; String subsystemtype = ""; - String security_domain_type = ""; String selected_hierarchy = ""; try { type = config.getString(PRE_CA_TYPE, ""); subsystemtype = config.getString("cs.type", ""); - security_domain_type = config.getString("securitydomain.select", ""); selected_hierarchy = config.getString("preop.hierarchy.select", ""); } catch (Exception e) { } @@ -277,7 +273,6 @@ public class AdminPanel extends WizardPanelBase { String name = HttpInput.getName(request, "name"); CMS.debug("AdminPanel update: email address = " + email); - String pwd = HttpInput.getPassword(request, "__pwd"); config.putString("preop.admin.uid", uid); config.putString("preop.admin.email", email); @@ -455,14 +450,6 @@ public class AdminPanel extends WizardPanelBase { private void submitRequest(String ca_hostname, int ca_port, HttpServletRequest request, HttpServletResponse response, Context context) throws IOException { IConfigStore config = CMS.getConfigStore(); - String sd_hostname = null; - int sd_port = -1; - - try { - sd_hostname = config.getString("securitydomain.host", ""); - sd_port = config.getInteger("securitydomain.httpseeport"); - } catch (Exception e) { - } String profileId = HttpInput.getID(request, "profileId"); if (profileId == null) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java index f619110fd..9e800b9cc 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java @@ -60,6 +60,7 @@ public class BaseServlet extends VelocityServlet { public void outputHttpParameters(HttpServletRequest httpReq) { CMS.debug("BaseServlet:service() uri = " + httpReq.getRequestURI()); + @SuppressWarnings("unchecked") Enumeration<String> paramNames = httpReq.getParameterNames(); while (paramNames.hasMoreElements()) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java index 5da169915..827f0ce92 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java @@ -154,7 +154,7 @@ public class CAInfoPanel extends WizardPanelBase { */ CMS.debug("CAInfoPanel: Ready to get url"); - Vector v = getUrlListFromSecurityDomain(cs, cstype, portType); + Vector<String> v = getUrlListFromSecurityDomain(cs, cstype, portType); v.addElement("External CA"); StringBuffer list = new StringBuffer(); int size = v.size(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java index 119dead0c..9c4315c05 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java @@ -39,7 +39,7 @@ import com.netscape.cms.servlet.wizard.WizardServlet; import com.netscape.cmsutil.crypto.CryptoUtil; public class CertPrettyPrintPanel extends WizardPanelBase { - private Vector mCerts = null; + private Vector<Cert> mCerts = null; public CertPrettyPrintPanel() { } @@ -124,7 +124,7 @@ public class CertPrettyPrintPanel extends WizardPanelBase { context.put("title", "Certificates Pretty Print"); try { - mCerts = new Vector(); + mCerts = new Vector<Cert>(); IConfigStore config = CMS.getConfigStore(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java index 04ab4dac8..20ddf9f2d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java @@ -145,11 +145,9 @@ public class CertRequestPanel extends WizardPanelBase { public void cleanUp() throws IOException { IConfigStore cs = CMS.getConfigStore(); - String select = ""; String list = ""; String tokenname = ""; try { - select = cs.getString("preop.subsystem.select", ""); list = cs.getString("preop.cert.list", ""); tokenname = cs.getString("preop.module.token", ""); } catch (Exception e) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java index ba5650542..9eb146294 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java @@ -45,7 +45,7 @@ public class ConfigHSMServlet extends ConfigBaseServlet { private static final long serialVersionUID = -330521231753992202L; private CryptoManager mCryptoManager = null; private Vector<Module> mSupportedModules = null; - private Vector mOtherModules = null; + private Vector<Module> mOtherModules = null; private String mDefaultTok = null; private Hashtable<String, PK11Module> mCurrModTable = new Hashtable<String, PK11Module>(); @@ -80,7 +80,7 @@ public class ConfigHSMServlet extends ConfigBaseServlet { public void loadOtherModules() { Enumeration<PK11Module> m = mCurrModTable.elements(); - mOtherModules = new Vector(); + mOtherModules = new Vector<Module>(); while (m.hasMoreElements()) { PK11Module mod = m.nextElement(); Enumeration<Module> s = mSupportedModules.elements(); @@ -102,7 +102,7 @@ public class ConfigHSMServlet extends ConfigBaseServlet { loadModTokens(module, mod); module.setFound(true); - mOtherModules.addElement((Object) module); + mOtherModules.addElement(module); break; } }// while diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java index 44046fdcd..c9618db19 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java @@ -66,7 +66,7 @@ public class ConfigRootCAServlet extends ConfigBaseServlet { } } - public Vector getProfiles() { + public Vector<CertInfoProfile> getProfiles() { IConfigStore config = CMS.getConfigStore(); String instancePath = ""; @@ -75,7 +75,7 @@ public class ConfigRootCAServlet extends ConfigBaseServlet { } catch (EBaseException e) { } String p[] = { "caCert.profile" }; - Vector profiles = new Vector(); + Vector<CertInfoProfile> profiles = new Vector<CertInfoProfile>(); for (int i = 0; i < p.length; i++) { try { @@ -102,7 +102,7 @@ public class ConfigRootCAServlet extends ConfigBaseServlet { if (profile == null) { profile = "caCert.profile"; } - Vector profiles = getProfiles(); + Vector<CertInfoProfile> profiles = getProfiles(); context.put("status", "display"); context.put("profiles", profiles); @@ -122,7 +122,7 @@ public class ConfigRootCAServlet extends ConfigBaseServlet { } context.put("status", "update"); context.put("error", ""); - Vector profiles = getProfiles(); + Vector<CertInfoProfile> profiles = getProfiles(); context.put("profiles", profiles); context.put("selected_profile_id", profile); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java index 377043d52..9e430e2fd 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java @@ -100,7 +100,6 @@ public class CreateSubsystemPanel extends WizardPanelBase { } String errorString = ""; - String url = ""; if (isPanelDone()) { try { @@ -145,7 +144,7 @@ public class CreateSubsystemPanel extends WizardPanelBase { } catch (EBaseException e) { } - Vector v = getUrlListFromSecurityDomain(config, cstype, "SecurePort"); + Vector<String> v = getUrlListFromSecurityDomain(config, cstype, "SecurePort"); StringBuffer list = new StringBuffer(); int size = v.size(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java index 2f5831794..c6db8a8b7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java @@ -136,7 +136,7 @@ public class DisplayCertChainPanel extends WizardPanelBase { } int size = 0; - Vector v = new Vector(); + Vector<String> v = new Vector<String>(); if (!certchain_size.equals("")) { try { 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 48875c4cc..663435cba 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 @@ -259,11 +259,9 @@ public class DonePanel extends WizardPanelBase { // update security domain String sdtype = ""; - String instanceName = ""; String subsystemName = ""; try { sdtype = cs.getString("securitydomain.select", ""); - instanceName = cs.getString("instanceId", ""); subsystemName = cs.getString("preop.subsystem.name", ""); } catch (Exception e) { } @@ -727,20 +725,15 @@ public class DonePanel extends WizardPanelBase { IConfigStore config = CMS.getConfigStore(); String cahost = ""; int caport = -1; - String sdhost = ""; - int sdport = -1; try { cahost = config.getString("preop.ca.hostname", ""); caport = config.getInteger("preop.ca.httpsport", -1); - sdhost = config.getString("securitydomain.host", ""); - sdport = config.getInteger("securitydomain.httpseeport", -1); } catch (Exception e) { } String ocsphost = CMS.getAgentHost(); int ocspport = Integer.parseInt(CMS.getAgentPort()); - int ocspagentport = Integer.parseInt(CMS.getAgentPort()); String session_id = CMS.getConfigSDSessionId(); String content = "xmlOutput=true&sessionID=" + session_id + "&ocsp_host=" + ocsphost + "&ocsp_port=" + ocspport; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java index 8575658ea..e6810ff42 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java @@ -93,12 +93,7 @@ public class GetCookie extends CMSServlet { CMS.debug("GetCookie start"); IAuthToken authToken = null; - int sessionMaxAge = SESSION_MAX_AGE; IConfigStore cs = CMS.getConfigStore(); - try { - sessionMaxAge = cs.getInteger("sessionMaxAge", SESSION_MAX_AGE); - } catch (Exception e) { - } IArgBlock header = CMS.createArgBlock(); IArgBlock ctx = CMS.createArgBlock(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java index 36ced4879..93c26cdf3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java @@ -97,11 +97,9 @@ public class ImportAdminCertPanel extends WizardPanelBase { IConfigStore cs = CMS.getConfigStore(); String type = ""; - String subsystemtype = ""; try { type = cs.getString("preop.ca.type", ""); - subsystemtype = cs.getString("cs.type", ""); } catch (Exception e) { } @@ -188,13 +186,11 @@ public class ImportAdminCertPanel extends WizardPanelBase { String type = ""; String subsystemtype = ""; - String security_domain_type = ""; String selected_hierarchy = ""; try { type = cs.getString("preop.ca.type", ""); subsystemtype = cs.getString("cs.type", ""); - security_domain_type = cs.getString("securitydomain.select", ""); selected_hierarchy = cs.getString("preop.hierarchy.select", ""); } catch (Exception e) { } diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java index 3b8f3b81f..66ca8a8bf 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java @@ -122,7 +122,6 @@ public class ImportTransportCert extends CMSServlet { IConfigStore cs = CMS.getConfigStore(); - String name = httpReq.getParameter("name"); String certsString = httpReq.getParameter("certificate"); try { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java index f0447170e..916ab199b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java @@ -287,7 +287,7 @@ public class NamePanel extends WizardPanelBase { } CMS.debug("NamePanel: Ready to get SSL EE HTTPS urls"); - Vector v = getUrlListFromSecurityDomain(config, "CA", "SecurePort"); + Vector<String> v = getUrlListFromSecurityDomain(config, "CA", "SecurePort"); v.addElement("External CA"); StringBuffer list = new StringBuffer(); int size = v.size(); @@ -782,14 +782,12 @@ public class NamePanel extends WizardPanelBase { //if no hselect, then not CA if (hselect.equals("") || hselect.equals("join")) { - String select = null; String url = getURL(request, config); URL urlx = null; if (url.equals("External CA")) { CMS.debug("NamePanel: external CA selected"); - select = "otherca"; config.putString("preop.ca.type", "otherca"); if (subsystem != null) { config.putString(PCERT_PREFIX + "signing.type", "remote"); @@ -801,7 +799,6 @@ public class NamePanel extends WizardPanelBase { CMS.debug("NamePanel: update: this is the external CA."); } else { CMS.debug("NamePanel: local CA selected"); - select = "sdca"; // parse URL (CA1 - https://...) url = url.substring(url.indexOf("https")); config.putString("preop.ca.url", url); @@ -833,7 +830,6 @@ public class NamePanel extends WizardPanelBase { while (c.hasMoreElements()) { Cert cert = c.nextElement(); String ct = cert.getCertTag(); - String tokenname = cert.getTokenname(); boolean enable = config.getBoolean(PCERT_PREFIX + ct + ".enable", true); if (!enable) continue; 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 ea0e79787..54a5ed3f6 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 @@ -165,7 +165,6 @@ public class RestoreKeyCertPanel extends WizardPanelBase { try { String s = config.getString("preop.pk12.path", ""); - String type = config.getString("preop.subsystem.select", ""); context.put("path", s); } catch (Exception e) { CMS.debug(e.toString()); @@ -265,8 +264,8 @@ public class RestoreKeyCertPanel extends WizardPanelBase { if (verifypfx) { CMS.debug("RestoreKeyCertPanel verify the PFX."); AuthenticatedSafes safes = pfx.getAuthSafes(); - Vector pkeyinfo_collection = new Vector(); - Vector cert_collection = new Vector(); + Vector<Vector<Object>> pkeyinfo_collection = new Vector<Vector<Object>>(); + Vector<Vector<Object>> cert_collection = new Vector<Vector<Object>>(); for (int i = 0; i < safes.getSize(); i++) { try { SEQUENCE scontent = safes.getSafeContentsAt(null, i); @@ -276,9 +275,8 @@ public class RestoreKeyCertPanel extends WizardPanelBase { if (oid.equals(SafeBag.PKCS8_SHROUDED_KEY_BAG)) { EncryptedPrivateKeyInfo privkeyinfo = (EncryptedPrivateKeyInfo) bag.getInterpretedBagContent(); - PasswordConverter passConverter = new PasswordConverter(); PrivateKeyInfo pkeyinfo = privkeyinfo.decrypt(password, new PasswordConverter()); - Vector pkeyinfo_v = new Vector(); + Vector<Object> pkeyinfo_v = new Vector<Object>(); pkeyinfo_v.addElement(pkeyinfo); SET bagAttrs = bag.getBagAttributes(); for (int k = 0; k < bagAttrs.size(); k++) { @@ -288,7 +286,7 @@ public class RestoreKeyCertPanel extends WizardPanelBase { SET val = attrs.getValues(); ANY ss = (ANY) val.elementAt(0); ByteArrayInputStream bbis = new ByteArrayInputStream(ss.getEncoded()); - BMPString sss = (BMPString) (new BMPString.Template()).decode(bbis); + BMPString sss = (BMPString) new BMPString.Template().decode(bbis); String s = sss.toString(); pkeyinfo_v.addElement(s); } @@ -298,7 +296,7 @@ public class RestoreKeyCertPanel extends WizardPanelBase { CertBag cbag = (CertBag) bag.getInterpretedBagContent(); OCTET_STRING str = (OCTET_STRING) cbag.getInterpretedCert(); byte[] x509cert = str.toByteArray(); - Vector cert_v = new Vector(); + Vector<Object> cert_v = new Vector<Object>(); cert_v.addElement(x509cert); SET bagAttrs = bag.getBagAttributes(); @@ -374,14 +372,10 @@ public class RestoreKeyCertPanel extends WizardPanelBase { cstype = toLowerCaseSubsystemType(cstype); String session_id = CMS.getConfigSDSessionId(); - String sd_hostname = ""; - int sd_port = -1; String master_hostname = ""; int master_port = -1; int master_ee_port = -1; try { - sd_hostname = config.getString("securitydomain.host", ""); - sd_port = config.getInteger("securitydomain.httpsadminport", -1); master_hostname = config.getString("preop.master.hostname", ""); master_port = config.getInteger("preop.master.httpsadminport", -1); master_ee_port = config.getInteger("preop.master.httpsport", -1); @@ -527,8 +521,8 @@ public class RestoreKeyCertPanel extends WizardPanelBase { return org.mozilla.jss.crypto.PrivateKey.Type.RSA; } - private void importkeycert(Vector pkeyinfo_collection, - Vector cert_collection) throws IOException { + private void importkeycert(Vector<Vector<Object>> pkeyinfo_collection, + Vector<Vector<Object>> cert_collection) throws IOException { CryptoManager cm = null; try { cm = CryptoManager.getInstance(); @@ -540,7 +534,7 @@ public class RestoreKeyCertPanel extends WizardPanelBase { for (int i = 0; i < pkeyinfo_collection.size(); i++) { try { - Vector pkeyinfo_v = (Vector) pkeyinfo_collection.elementAt(i); + Vector<Object> pkeyinfo_v = pkeyinfo_collection.elementAt(i); PrivateKeyInfo pkeyinfo = (PrivateKeyInfo) pkeyinfo_v.elementAt(0); String nickname = (String) pkeyinfo_v.elementAt(1); byte[] x509cert = getX509Cert(nickname, cert_collection); @@ -569,8 +563,7 @@ public class RestoreKeyCertPanel extends WizardPanelBase { KeyWrapper wrapper = token.getKeyWrapper(KeyWrapAlgorithm.DES3_CBC_PAD); wrapper.initUnwrap(sk, param); - org.mozilla.jss.crypto.PrivateKey pp = - wrapper.unwrapPrivate(encpkey, getPrivateKeyType(publickey), publickey); + wrapper.unwrapPrivate(encpkey, getPrivateKeyType(publickey), publickey); } catch (Exception e) { CMS.debug("RestoreKeyCertPanel importkeycert: Exception=" + e.toString()); @@ -579,7 +572,7 @@ public class RestoreKeyCertPanel extends WizardPanelBase { for (int i = 0; i < cert_collection.size(); i++) { try { - Vector cert_v = (Vector) cert_collection.elementAt(i); + Vector<Object> cert_v = cert_collection.elementAt(i); byte[] cert = (byte[]) cert_v.elementAt(0); if (cert_v.size() > 1) { String name = (String) cert_v.elementAt(1); @@ -658,10 +651,10 @@ public class RestoreKeyCertPanel extends WizardPanelBase { return null; } - private byte[] getX509Cert(String nickname, Vector cert_collection) + private byte[] getX509Cert(String nickname, Vector<Vector<Object>> cert_collection) throws IOException { for (int i = 0; i < cert_collection.size(); i++) { - Vector v = (Vector) cert_collection.elementAt(i); + Vector<Object> v = cert_collection.elementAt(i); byte[] b = (byte[]) v.elementAt(0); X509CertImpl impl = null; try { @@ -703,8 +696,7 @@ public class RestoreKeyCertPanel extends WizardPanelBase { if (token.equals("sslserver")) continue; String tokenname = config.getString("preop.module.token", ""); - CryptoToken tok = cm.getTokenByName(tokenname); - CryptoStore store = tok.getCryptoStore(); + cm.getTokenByName(tokenname); // throw exception if token doesn't exist String name1 = "preop.master." + token + ".nickname"; String nickname = config.getString(name1, ""); if (!tokenname.equals("Internal Key Storage Token") && 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 ea47e82ed..55f7171ef 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 @@ -739,7 +739,6 @@ public class WizardPanelBase implements IWizardPanel { cs.putString("preop.cookie", cookie); return true; } else { - String error = parser.getValue("Error"); return false; } } catch (Exception e) { @@ -990,15 +989,15 @@ public class WizardPanelBase implements IWizardPanel { int len = nodeList.getLength(); for (int i = 0; i < len; i++) { - Vector v_hostname = + Vector<String> v_hostname = parser.getValuesFromContainer(nodeList.item(i), "Host"); - Vector v_https_admin_port = + Vector<String> v_https_admin_port = parser.getValuesFromContainer(nodeList.item(i), "SecureAdminPort"); - Vector v_domain_mgr = + Vector<String> v_domain_mgr = parser.getValuesFromContainer(nodeList.item(i), "DomainManager"); @@ -1014,10 +1013,10 @@ public class WizardPanelBase implements IWizardPanel { return dm.equalsIgnoreCase("true"); } - public Vector getMasterUrlListFromSecurityDomain(IConfigStore config, + public Vector<String> getMasterUrlListFromSecurityDomain(IConfigStore config, String type, String portType) { - Vector v = new Vector(); + Vector<String> v = new Vector<String>(); try { String hostname = config.getString("securitydomain.host"); @@ -1025,18 +1024,8 @@ public class WizardPanelBase implements IWizardPanel { CMS.debug("Getting domain.xml from CA..."); String c = getDomainXML(hostname, httpsadminport, true); - String list = ""; CMS.debug("Type " + type); - if (type.equals("CA")) { - list = "CAList"; - } else if (type.equals("KRA")) { - list = "KRAList"; - } else if (type.equals("OCSP")) { - list = "OCSPList"; - } else if (type.equals("TKS")) { - list = "TKSList"; - } CMS.debug("Getting " + portType + " from Security Domain ..."); if (!portType.equals("UnSecurePort") && @@ -1061,16 +1050,16 @@ public class WizardPanelBase implements IWizardPanel { CMS.debug("Len " + len); for (int i = 0; i < len; i++) { - Vector v_clone = parser.getValuesFromContainer(nodeList.item(i), + Vector<String> v_clone = parser.getValuesFromContainer(nodeList.item(i), "Clone"); String clone = (String) v_clone.elementAt(0); if (clone.equalsIgnoreCase("true")) continue; - Vector v_name = parser.getValuesFromContainer(nodeList.item(i), + Vector<String> v_name = parser.getValuesFromContainer(nodeList.item(i), "SubsystemName"); - Vector v_host = parser.getValuesFromContainer(nodeList.item(i), + Vector<String> v_host = parser.getValuesFromContainer(nodeList.item(i), "Host"); - Vector v_port = parser.getValuesFromContainer(nodeList.item(i), + Vector<String> v_port = parser.getValuesFromContainer(nodeList.item(i), portType); v.addElement(v_name.elementAt(0) @@ -1179,15 +1168,15 @@ public class WizardPanelBase implements IWizardPanel { int len = nodeList.getLength(); for (int i = 0; i < len; i++) { - Vector v_hostname = + Vector<String> v_hostname = parser.getValuesFromContainer(nodeList.item(i), "Host"); - Vector v_https_ee_port = + Vector<String> v_https_ee_port = parser.getValuesFromContainer(nodeList.item(i), "SecurePort"); - Vector v_https_admin_port = + Vector<String> v_https_admin_port = parser.getValuesFromContainer(nodeList.item(i), "SecureAdminPort"); @@ -1234,11 +1223,11 @@ public class WizardPanelBase implements IWizardPanel { int len = nodeList.getLength(); for (int i = 0; i < len; i++) { - Vector v_admin_port = + Vector<String> v_admin_port = parser.getValuesFromContainer(nodeList.item(i), "SecureAdminPort"); - Vector v_port = null; + Vector<String> v_port = null; if (portType.equals("UnSecurePort")) { v_port = parser.getValuesFromContainer(nodeList.item(i), "UnSecurePort"); |