diff options
Diffstat (limited to 'pki/base/silent/src/com/netscape/pkisilent/common')
7 files changed, 6 insertions, 36 deletions
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java b/pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java index f5737167e..3e4f0bfa2 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java @@ -558,8 +558,8 @@ public class CMSConfig extends ServerInfo { } CMSConfig s = new CMSConfig(args[0]); - boolean secureC = false; + // boolean secureC = false; // s.EnableDirEnrollment(secureC); s.saveCMSConfig(); diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java b/pki/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java index 8071dcb29..61305305e 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java @@ -23,7 +23,6 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.PrintStream; -import java.util.Enumeration; import java.util.Vector; import org.mozilla.jss.CryptoManager; @@ -77,16 +76,9 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, } public String select(@SuppressWarnings("rawtypes") Vector nicknames) { - Enumeration<?> e = nicknames.elements(); System.out.println("nicknames size = " + nicknames.size()); - int i = 0; - - while (e.hasMoreElements()) { - String s = (String) e.nextElement(); - - i++; - } + int i = nicknames.size(); if (i > 0) { return (String) nicknames.elementAt(0); @@ -165,8 +157,6 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, // Submit requests public boolean Send() { - boolean st = false; - try { if (!loginCertDB()) { @@ -235,7 +225,7 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, private boolean loginCertDB() { CryptoManager manager; - Password pass1 = null, pass2 = null; + Password pass1 = null; try { System.out.println("Step 1: Initializing CryptoManager"); @@ -282,8 +272,6 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, public boolean Send_withGET() { - boolean st = false; - try { if (!loginCertDB()) { diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/ParseXML.java b/pki/base/silent/src/com/netscape/pkisilent/common/ParseXML.java index 22c1c402c..de1b38172 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/ParseXML.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/ParseXML.java @@ -127,7 +127,6 @@ public class ParseXML { // returns an arraylist of values for the corresponding tag public ArrayList<String> constructValueList(String first, String second) { - String temp = null; ArrayList<String> al = new ArrayList<String>(); try { diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java b/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java index b6ab3fe8c..31fb07b3e 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java @@ -83,7 +83,6 @@ public class PostQuery { try { - BufferedReader mbufferedReader = null; URL myUrl = new URL(URLString); String userPassword = adminID + ":" + adminPWD; @@ -108,8 +107,6 @@ public class PostQuery { System.out.println("Query: " + postQuery); - int querylength = postQuery.length(); - os.writeBytes(postQuery); os.flush(); os.close(); diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java b/pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java index f63a0f54b..f63456b4d 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java @@ -177,18 +177,6 @@ public class ServerInfo { String s = in.readLine(); while (s != null) { - // <SSLPARAMS servercertnickname="Server-Cert cert-firefly" - int index = s.indexOf("servercertnickname"); - - if (index >= 0) { - String str = s.substring(index + 20); - StringTokenizer tokenizer = new StringTokenizer(str, "\""); - - if (tokenizer.hasMoreElements()) { - String mServerCertNickname = tokenizer.nextToken(); - } - } - // <LS id="agent" ip="0.0.0.0" port="8101" security="on" // acceptorthreads="1" blocking="no"> if (s.startsWith("<LS id=")) { @@ -213,7 +201,7 @@ public class ServerInfo { } if (index1 != 5 && index2 == IP && !token.equals(" ip=")) { - String ip = token; + // token contains the ip value } else if (index2 == PORT && !token.equals(" port=")) { switch (index1) { diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java b/pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java index 87161d689..0e4ed9cdd 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java @@ -468,7 +468,6 @@ public class TestClient implements SSLCertificateApprovalCallback { public String getFreePort(String s) { Integer x = new Integer(s); int p = x.intValue(); - boolean st = true; // if p = 0, then the serversocket constructor get a free port by itself p = 0; @@ -756,10 +755,10 @@ public class TestClient implements SSLCertificateApprovalCallback { ************************************************************* */ - String TransportCert = + /* + String TransportCert = "MIICJTCCAY6gAwIBAgIBBTANBgkqhkiG9w0BAQQFADBDMRswGQYDVQQKExJhY2NlcHRhY25ldGVzdDEwMjQxFzAVBgNVBAsTDmFjY2VwdGFuY2V0ZXN0MQswCQYDVQQDEwJjYTAeFw0wMzA0MTgyMjMwMDhaFw0wNDA0MTcxMDI2MDhaMDkxETAPBgNVBAoTCHRlc3QxMDI0MRcwFQYDVQQLEw5hY2NlcHRhbmNldGVzdDELMAkGA1UEAxMCcmEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN6sQ3mSU8mL6i6gTZIXDLzOZPhYOkQLpnJjit5hcPZ0JMn0CQVXo4QjKN1xvuZv8qVlZoQw9czmzp/knTa0sCDgFKd0r+u0TnLeZkJMSimgFnma9CnChlaDHnBd8Beu4vyaHmo7rJ0xA4etn7HjhmKbaQZOcv/aP0SW9JXRga7ZAgMBAAGjMzAxMA4GA1UdDwEB/wQEAwIFIDAfBgNVHSMEGDAWgBSC3fsQHb7fddr2vL0UdkM2dAmUWzANBgkqhkiG9w0BAQQFAAOBgQBkAGbgd9HIqwoLKAr+V6bj9oWesDmDH80gPPxj10qyWSQYIs8PofOs/75yGS9nxhydtgSMFoBgCPdroUI31kZQQlFzxtudGoKD+5MWSXho79XzPwpjheOBYgpX6ch+L4tMLFDpqeraB1yZESO5EEeKm20DGVBOKVWxHhddO1BenA=="; - /* CRMFClient CrmfClient = new CRMFClient(s.GetHostName(),s.GetEEPort()); CrmfClient.setDBInfo(t.GetClientCertDB(),t.GetClientCertDBPW()); CrmfClient.setTransportCert(TransportCert); diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java b/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java index e5c2f0b4a..5761c6f77 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java @@ -502,7 +502,6 @@ public class UserEnroll extends TestClient { public static void main(String args[]) { // Exit Status - (0) for error/Fail // - requestId Pass - boolean st; UserEnroll e = new UserEnroll("jupiter2", "1027", "E=test,cn=test,uid=test", "test", "test", "test", "t1", "t", |