diff options
Diffstat (limited to 'pki/base/silent/src/com/netscape/pkisilent')
4 files changed, 9 insertions, 82 deletions
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java index 3dd708a3a..caf393ad9 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java @@ -225,7 +225,6 @@ public class ConfigureDRM { } public boolean TokenChoicePanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -273,7 +272,6 @@ public class ConfigureDRM { } public boolean DomainPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -299,14 +297,8 @@ public class ConfigureDRM { } public boolean DisplayChainPanel() { - boolean st = false; - HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); - String query_string = null; - - query_string = "p=4" + "&op=next" + "&xml=true"; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + String query_string = "p=4" + "&op=next" + "&xml=true"; + hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); return true; @@ -314,10 +306,7 @@ public class ConfigureDRM { public boolean SecurityDomainLoginPanel() { try { - boolean st = false; HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); String kra_url = "https://" + cs_hostname + ":" + cs_port + "/kra/admin/console/config/wizard" + @@ -374,7 +363,6 @@ public class ConfigureDRM { } public boolean SubsystemPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -424,7 +412,6 @@ public class ConfigureDRM { } public boolean LdapConnectionPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -452,7 +439,6 @@ public class ConfigureDRM { } public boolean KeyPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -540,7 +526,6 @@ public class ConfigureDRM { } public boolean CertSubjectPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -611,14 +596,9 @@ public class ConfigureDRM { } public boolean CertificatePanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - ArrayList<String> req_list = null; - ArrayList<String> cert_list = null; - ArrayList<String> dn_list = null; - ArrayList<String> pp_list = null; String query_string = "p=10" + "&op=next" + "&xml=true" + "&subsystem=" + @@ -648,7 +628,6 @@ public class ConfigureDRM { } public boolean BackupPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -669,7 +648,6 @@ public class ConfigureDRM { } public boolean SavePKCS12Panel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -692,7 +670,7 @@ public class ConfigureDRM { String line = null; while ((line = br.readLine()) != null) System.out.println("Error: " + line); - int exitVal = proc.waitFor(); + proc.waitFor(); // verify p12 file @@ -729,7 +707,6 @@ public class ConfigureDRM { } public boolean AdminCertReqPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -788,8 +765,6 @@ public class ConfigureDRM { public boolean AdminCertImportPanel() { boolean st = false; HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); String query_string = "serialNumber=" + admin_serial_number + "&importCert=" + "true"; @@ -826,7 +801,6 @@ public class ConfigureDRM { } public boolean UpdateDomainPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java index 7e481c791..bf599ed4c 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java @@ -207,7 +207,6 @@ public class ConfigureOCSP { } public boolean TokenChoicePanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -257,7 +256,6 @@ public class ConfigureOCSP { } public boolean DomainPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -283,14 +281,10 @@ public class ConfigureOCSP { } public boolean DisplayChainPanel() { - boolean st = false; - HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); String query_string = null; query_string = "p=4" + "&op=next" + "&xml=true"; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); // parse xml // bais = new ByteArrayInputStream(hr.getHTML().getBytes()); // px.parse(bais); @@ -301,10 +295,7 @@ public class ConfigureOCSP { } public boolean SecurityDomainLoginPanel() { - boolean st = false; HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); String ocsp_url = "https://" + cs_hostname + ":" + cs_port + "/ocsp/admin/console/config/wizard" + @@ -349,7 +340,6 @@ public class ConfigureOCSP { } public boolean SubsystemPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -369,7 +359,6 @@ public class ConfigureOCSP { } public boolean LdapConnectionPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -397,7 +386,6 @@ public class ConfigureOCSP { } public boolean KeyPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -460,7 +448,6 @@ public class ConfigureOCSP { } public boolean CertSubjectPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -518,14 +505,9 @@ public class ConfigureOCSP { } public boolean CertificatePanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - ArrayList<String> req_list = null; - ArrayList<String> cert_list = null; - ArrayList<String> dn_list = null; - ArrayList<String> pp_list = null; String query_string = "p=10" + "&op=next" + "&xml=true" + "&subsystem=" + @@ -556,7 +538,6 @@ public class ConfigureOCSP { } public boolean BackupPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -577,10 +558,7 @@ public class ConfigureOCSP { } public boolean SavePKCS12Panel() { - boolean st = false; HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); String query_string = ""; @@ -601,7 +579,7 @@ public class ConfigureOCSP { String line = null; while ((line = br.readLine()) != null) System.out.println("Error: " + line); - int exitVal = proc.waitFor(); + proc.waitFor(); // verify p12 file @@ -628,7 +606,6 @@ public class ConfigureOCSP { } public boolean AdminCertReqPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -690,8 +667,6 @@ public class ConfigureOCSP { public boolean AdminCertImportPanel() { boolean st = false; HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); String query_string = "serialNumber=" + admin_serial_number + "&importCert=" + "true" + @@ -729,7 +704,6 @@ public class ConfigureOCSP { } public boolean UpdateDomainPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java index a9345cc5f..d8a6c7feb 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java @@ -20,7 +20,6 @@ package com.netscape.pkisilent; import java.io.ByteArrayInputStream; import java.net.URLEncoder; -import java.util.ArrayList; import com.netscape.osutil.OSUtil; import com.netscape.pkisilent.argparser.ArgParser; @@ -160,7 +159,6 @@ public class ConfigureRA { } public boolean DomainPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -186,24 +184,15 @@ public class ConfigureRA { } public boolean DisplayChainPanel() { - boolean st = false; - HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); - String query_string = null; - - query_string = "p=2" + "&op=next" + "&xml=true"; - hr = hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); + String query_string = "p=2" + "&op=next" + "&xml=true"; + hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string); return true; } public boolean SecurityDomainLoginPanel() { - boolean st = false; HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); String ra_url = "https://" + cs_hostname + ":" + cs_port + "/ra/admin/console/config/wizard" + @@ -247,7 +236,6 @@ public class ConfigureRA { } public boolean SubsystemPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -285,7 +273,6 @@ public class ConfigureRA { } public boolean DBPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -305,7 +292,6 @@ public class ConfigureRA { } public boolean TokenChoicePanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -363,7 +349,6 @@ public class ConfigureRA { } public boolean KeyPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -392,13 +377,9 @@ public class ConfigureRA { } public boolean CertSubjectPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - ArrayList<String> req_list = null; - ArrayList<String> cert_list = null; - ArrayList<String> dn_list = null; String ca_url = "https://" + ca_hostname + ":" + ca_ssl_port; @@ -426,7 +407,6 @@ public class ConfigureRA { } public boolean CertificatePanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -450,7 +430,6 @@ public class ConfigureRA { } public boolean AdminCertReqPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java b/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java index 1c308e2c2..d619afcc2 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java @@ -248,7 +248,7 @@ public class ComCrypto { System.out.println("Manager object is null"); } - X509Certificate cert = manager.importCertPackage(tmp.getBytes(), cn); + manager.importCertPackage(tmp.getBytes(), cn); return true; @@ -277,7 +277,7 @@ public class ComCrypto { System.out.println("Manager object is null"); } - X509Certificate cert = manager.importCACertPackage(tmp.getBytes()); + manager.importCACertPackage(tmp.getBytes()); return true; |