diff options
Diffstat (limited to 'pki/base/silent/src/com/netscape/pkisilent')
11 files changed, 17 insertions, 138 deletions
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java index 84dd68a1c..ee41e5a19 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java @@ -261,7 +261,6 @@ public class ConfigureCA { public boolean TokenChoicePanel() { try { - boolean st = false; HTTPResponse hr = null; String query_string = null; @@ -332,9 +331,8 @@ public class ConfigureCA { public boolean DisplayCertChainPanel() { try { - HTTPResponse hr = null; String 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); return true; } catch (Exception e) { System.out.println("Exception in DisplayCertChainPanel(): " + e.toString()); @@ -345,7 +343,6 @@ public class ConfigureCA { public boolean SecurityDomainLoginPanel() { try { - boolean st = false; HTTPResponse hr = null; String subca_url = "https://" + cs_hostname + ":" + cs_port + @@ -394,7 +391,6 @@ public class ConfigureCA { public boolean CreateCAPanel() { try { - boolean st = false; HTTPResponse hr = null; String query_string = null; @@ -454,7 +450,6 @@ public class ConfigureCA { public boolean HierarchyPanel() { try { - boolean st = false; HTTPResponse hr = null; String query_string = "p=8" + "&op=next" + "&xml=true"; @@ -479,7 +474,6 @@ public class ConfigureCA { public boolean LdapConnectionPanel() { try { - boolean st = false; HTTPResponse hr = null; String query_string = "p=9" + "&op=next" + "&xml=true" + "&host=" @@ -509,7 +503,6 @@ public class ConfigureCA { public boolean KeyPanel() { try { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -602,7 +595,6 @@ public class ConfigureCA { public boolean CertSubjectPanel() { try { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -749,7 +741,6 @@ public class ConfigureCA { public boolean CertificatePanel() { try { - boolean st = false; HTTPResponse hr = null; String query_string = "p=12" + "&op=next" + "&xml=true" + "&subsystem=" @@ -778,14 +769,12 @@ public class ConfigureCA { public boolean CertificatePanelExternal() { try { - 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 genString = "...certificate be generated internally..."; String query_string = "p=12" + "&op=apply" + "&xml=true" + "&subsystem=" @@ -873,7 +862,6 @@ public class ConfigureCA { public boolean BackupPanel() { try { - boolean st = false; HTTPResponse hr = null; if (save_p12.equalsIgnoreCase("true")) { @@ -906,7 +894,7 @@ public class ConfigureCA { String line = null; while ((line = br.readLine()) != null) System.out.println("Error: " + line); - int exitVal = proc.waitFor(); + proc.waitFor(); // verify p12 file // Decode the P12 file @@ -977,7 +965,6 @@ public class ConfigureCA { public boolean AdminCertReqPanel() { try { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); @@ -1087,7 +1074,6 @@ public class ConfigureCA { public boolean UpdateDomainPanel() { try { - 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 bf599ed4c..254d9bcec 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java @@ -611,8 +611,6 @@ public class ConfigureOCSP { ParseXML px = new ParseXML(); String admin_cert_request = null; - String cert_subject = "CN=ocsp-" + admin_user; - ComCrypto cCrypt = new ComCrypto(client_certdb_dir, client_certdb_pwd, agent_cert_subject, diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java index d8a6c7feb..cade95fa8 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java @@ -255,7 +255,6 @@ public class ConfigureRA { px.prettyprintxml(); sleep_time(); - String ca_url = "https://" + ca_hostname + ":" + ca_ssl_port; // CA choice panel query_string = "p=4" + @@ -381,8 +380,6 @@ public class ConfigureRA { ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - String ca_url = "https://" + ca_hostname + ":" + ca_ssl_port; - String query_string = "p=9" + "&sslserver=" + URLEncoder.encode(ra_server_cert_subject_name) + diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java index 4c33a8479..62947e4a2 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java @@ -297,18 +297,13 @@ public class ConfigureSubCA { } public boolean SecurityDomainLoginPanel() { - boolean st = false; - HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); - String subca_url = "https://" + cs_hostname + ":" + cs_port + "/ca/admin/console/config/wizard" + "?p=5&subsystem=CA"; String query_string = "url=" + URLEncoder.encode(subca_url); - hr = hc.sslConnect(sd_hostname, sd_admin_port, sd_login_uri, query_string); + HTTPResponse hr = hc.sslConnect(sd_hostname, sd_admin_port, sd_login_uri, query_string); String query_string_1 = "uid=" + sd_admin_name + "&pwd=" + URLEncoder.encode(sd_admin_password) + @@ -340,20 +335,14 @@ public class ConfigureSubCA { } public boolean DisplayChainPanel() { - boolean st = false; - HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); - String query_string = null; - - query_string = "p=5" + "&op=next" + "&xml=true" + + String query_string = "p=5" + "&op=next" + "&xml=true" + "&choice=newsubsystem" + "&subsystemName=" + URLEncoder.encode(subsystem_name) + "&subsystemName=" + URLEncoder.encode(subsystem_name) + "&urls=0"; - 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); @@ -493,8 +482,6 @@ public class ConfigureSubCA { ArrayList<String> cert_list = null; ArrayList<String> dn_list = null; - String domain_url = "https://" + ca_hostname + ":" + ca_ssl_port; - String query_string = "p=11" + "&op=next" + "&xml=true" + "&signing=" + URLEncoder.encode(subca_sign_cert_subject_name) + @@ -574,14 +561,9 @@ public class ConfigureSubCA { } 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=12" + "&op=next" + "&xml=true" + "&signing=" + @@ -654,14 +636,11 @@ public class ConfigureSubCA { } public boolean AdminCertReqPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); String admin_cert_request = null; - String cert_subject = "CN=" + "subca-" + admin_user; - ComCrypto cCrypt = new ComCrypto(client_certdb_dir, client_certdb_pwd, agent_cert_subject, @@ -716,15 +695,12 @@ public class ConfigureSubCA { 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" + ""; - hr = hc.sslConnect(cs_hostname, cs_port, admin_uri, query_string); + HTTPResponse hr = hc.sslConnect(cs_hostname, cs_port, admin_uri, query_string); // get response data // String cert_to_import = diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java index acc699673..5fad4790e 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java @@ -268,14 +268,8 @@ public class ConfigureTKS { } 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); // parse xml // bais = new ByteArrayInputStream(hr.getHTML().getBytes()); // px.parse(bais); @@ -286,18 +280,13 @@ public class ConfigureTKS { } public boolean SecurityDomainLoginPanel() { - boolean st = false; - HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); - String tks_url = "https://" + cs_hostname + ":" + cs_port + "/tks/admin/console/config/wizard" + "?p=5&subsystem=TKS"; String query_string = "url=" + URLEncoder.encode(tks_url); - hr = hc.sslConnect(sd_hostname, sd_admin_port, sd_login_uri, query_string); + HTTPResponse hr = hc.sslConnect(sd_hostname, sd_admin_port, sd_login_uri, query_string); String query_string_1 = "uid=" + sd_admin_name + "&pwd=" + URLEncoder.encode(sd_admin_password) + @@ -490,14 +479,9 @@ public class ConfigureTKS { } 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=" + @@ -544,14 +528,9 @@ public class ConfigureTKS { } public boolean SavePKCS12Panel() { - boolean st = false; - HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); - String query_string = ""; - hr = hc.sslConnect(cs_hostname, cs_port, pkcs12_uri, query_string); + HTTPResponse hr = hc.sslConnect(cs_hostname, cs_port, pkcs12_uri, query_string); // dump hr.getResponseData() to file @@ -595,14 +574,11 @@ public class ConfigureTKS { } public boolean AdminCertReqPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); String admin_cert_request = null; - String cert_subject = "CN=tks-" + admin_user; - ComCrypto cCrypt = new ComCrypto(client_certdb_dir, client_certdb_pwd, agent_cert_subject, @@ -656,15 +632,12 @@ public class ConfigureTKS { 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" + ""; - hr = hc.sslConnect(sd_hostname, sd_admin_port, admin_uri, query_string); + HTTPResponse hr = hc.sslConnect(sd_hostname, sd_admin_port, admin_uri, query_string); // get response data // String cert_to_import = diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java index 10cdc7821..4982a2f2d 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.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; @@ -221,32 +220,21 @@ public class ConfigureTPS { } 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; } public boolean SecurityDomainLoginPanel() { - boolean st = false; - HTTPResponse hr = null; - ByteArrayInputStream bais = null; - ParseXML px = new ParseXML(); - String tps_url = "https://" + cs_hostname + ":" + cs_port + "/tps/admin/console/config/wizard" + "?p=3&subsystem=TPS"; String query_string = "url=" + URLEncoder.encode(tps_url) + ""; - hr = hc.sslConnect(sd_hostname, sd_admin_port, sd_login_uri, query_string); + HTTPResponse hr = hc.sslConnect(sd_hostname, sd_admin_port, sd_login_uri, query_string); String query_string_1 = "uid=" + sd_admin_name + "&pwd=" + URLEncoder.encode(sd_admin_password) + @@ -302,7 +290,6 @@ public class ConfigureTPS { px.prettyprintxml(); sleep_time(); - String ca_url = "https://" + ca_hostname + ":" + ca_ssl_port; // CA choice panel query_string = "p=6" + @@ -337,8 +324,6 @@ public class ConfigureTPS { ss_keygen = "keygen"; } - String drm_url = "https://" + drm_hostname + ":" + drm_ssl_port; - query_string = "p=8" + "&choice=" + ss_keygen + "&urls=0" + @@ -474,12 +459,9 @@ public class ConfigureTPS { } public boolean KeyPanel() { - boolean st = false; HTTPResponse hr = null; ByteArrayInputStream bais = null; ParseXML px = new ParseXML(); - ArrayList<String> friendly_list = null; - ArrayList<String> dn_list = null; String query_string = "p=11" + "&keytype=" + key_type + @@ -508,16 +490,9 @@ public class ConfigureTPS { } 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; - ArrayList<String> friendly_list = null; - - String ca_url = "https://" + ca_hostname + ":" + ca_ssl_port; String query_string = "p=12" + "&sslserver=" + @@ -549,14 +524,9 @@ public class ConfigureTPS { } 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=13" + "&sslserver=" + diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java index d6f02d9c6..ed5f98b1d 100755 --- a/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java +++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java @@ -811,7 +811,6 @@ public class ArgParser { } } if (outOfRange) { - String errmsg = "value " + s + " not in range "; throw new ArgParseException( name, "value '" + s + "' not in range " + rangeDesc); } @@ -1040,7 +1039,6 @@ public class ArgParser { private void scanRangeSpec(Record rec, String s) throws IllegalArgumentException { StringScanner scanner = new StringScanner(s); - int i0, i = 1; char c, c0, c1; scanner.setStringDelimiters(")],}"); diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java b/pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java index d0222897d..91a273df6 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java @@ -463,12 +463,10 @@ public class CMSLDAP { **/ public boolean TurnOnSSL(String certPrefix, String certName, String sslport) { - String dn; String CIPHERS = "-rsa_null_md5,+rsa_fips_3des_sha,+rsa_fips_des_sha,+rsa_3des_sha,+rsa_rc4_128_md5,+rsa_des_sha,+rsa_rc2_40_md5,+rsa_rc4_40_md5"; try { - boolean found = false; int searchScope = LDAPv2.SCOPE_SUB; String getAttrs[] = { "nssslactivation" }; @@ -507,9 +505,10 @@ public class CMSLDAP { // conn.delete("cn=RSA,cn=encryption,cn=config"); try { - LDAPSearchResults results = conn.search( + conn.search( "cn=RSA,cn=encryption,cn=config", searchScope, null, - getAttrs, false); + getAttrs, false); // check for errors + LDAPAttribute cn = new LDAPAttribute("cn", "RSA"); LDAPAttribute ssltoken = new LDAPAttribute("nsssltoken", "internal (software)"); 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 d619afcc2..1c10db8fb 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java @@ -18,11 +18,7 @@ package com.netscape.pkisilent.common; // All rights reserved. // --- END COPYRIGHT BLOCK --- -import java.io.BufferedReader; import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; import java.security.KeyPair; import netscape.security.x509.X500Name; @@ -492,13 +488,6 @@ public class ComCrypto { } public String generateCRMFrequest() { - URL url = null; - URLConnection conn = null; - InputStream is = null; - BufferedReader reader = null; - boolean success = false; - int num = 1; - long total_time = 0; KeyPair pair = null; System.out.println("Debug : initialize crypto Manager"); @@ -622,9 +611,6 @@ public class ComCrypto { public String generateCRMFtransport() { - boolean success = false; - int num = 1; - long total_time = 0; KeyPair pair = null; try { diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/Request.java b/pki/base/silent/src/com/netscape/pkisilent/common/Request.java index 9ee700013..0f0827d67 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/Request.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/Request.java @@ -349,7 +349,6 @@ public class Request extends TestClient { String AUTHID = "header.authorityid = "; String seqnum = "record.seqNum"; - int size = s.capacity(); String res = s.toString(); int ret = 0; @@ -635,7 +634,6 @@ public class Request extends TestClient { StringBuffer s = new StringBuffer(); s = con.getPage(); - String line; if (debug) { System.out.println(s.toString()); @@ -967,7 +965,6 @@ public class Request extends TestClient { seqNumFrom = x.intValue(); Integer y = new Integer(To); - int t = y.intValue(); if ((y.intValue() - seqNumFrom) > 50) { maxCount = 50; diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/checkRequest.java b/pki/base/silent/src/com/netscape/pkisilent/common/checkRequest.java index 99a6e0849..c4599ffde 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/checkRequest.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/checkRequest.java @@ -257,7 +257,6 @@ public class checkRequest extends TestClient { FileOutputStream fos = new FileOutputStream(certfile); if (ldapformat.equals("true")) { - Integer m = new Integer("1"); String tmp = "description: 2;" + Integer.parseInt(serialNumber, 16) + ";" + issuer + ";" + subject + "\n"; |