summaryrefslogtreecommitdiffstats
path: root/pki/base/silent/src/com/netscape
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/silent/src/com/netscape')
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java8
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/AutoInstaller.java209
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java59
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java11
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java14
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java16
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java4
7 files changed, 0 insertions, 321 deletions
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java
index fae67c791..6153f180f 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java
@@ -577,14 +577,6 @@ class StringScanner
}
}
- private int skipWhiteSpace(int k)
- {
- while (Character.isWhitespace(buf[k]))
- { k++;
- }
- return k;
- }
-
public boolean atEnd()
{
return idx == len;
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/AutoInstaller.java b/pki/base/silent/src/com/netscape/pkisilent/common/AutoInstaller.java
index a16a6cc53..925e04dc0 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/AutoInstaller.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/AutoInstaller.java
@@ -748,60 +748,6 @@ public class AutoInstaller {
}
- private boolean taskCloneMaster() {
- System.out.println("configuring Cert Instance : taskCloneMaster");
- setConfigURL();
- String myStringUrl = "http://" + host + ":" + adminPort + configURL;
-
- System.out.println(myStringUrl);
- String query = "serverRoot=" + URLEncoder.encode(serverRoot);
-
- query += "&";
- query += "&claPortnumEE=" + URLEncoder.encode(caEEPort);
- query += "&claPortnum=" + URLEncoder.encode(caAgentPortnum);
- query += "&claHostname=" + URLEncoder.encode(caHostname);
- query += "&ra=false";
- query += "&ca=true";
- query += "&kra=false";
- query += "&subsystems=ca";
- query += "&cloning=true";
- query += "&cloningInstance=" + URLEncoder.encode(cloneInstanceId);
- query += "&claTimeout=" + URLEncoder.encode("60");
- query += "&internaldb.ldapauth.bindDN="
- + URLEncoder.encode(dbLDAPauthDN);
- query += "&AdminUserPassword=" + URLEncoder.encode(adminPWD);
- query += "&db.password=" + URLEncoder.encode(dbPassword);
- query += "&instanceID=" + URLEncoder.encode(instanceID);
- query += "&opType=" + URLEncoder.encode("OP_MODIFY");
- query += "&taskID=" + URLEncoder.encode("taskCloneMaster");
- query += "&cmsSeed=0";
- setPostQueryString(query);
- return Connect(myStringUrl);
- }
-
- private boolean taskCloning() {
- System.out.println("configuring Cert Instance : taskCloning");
- setConfigURL();
- String myStringUrl = "http://" + host + ":" + adminPort + configURL;
-
- System.out.println(myStringUrl);
- String query = "serverRoot=" + URLEncoder.encode(serverRoot);
-
- query += "&";
- query += "&cloneTokenPasswd=" + URLEncoder.encode(dbPassword);
- query += "&cloneTokenName=" + URLEncoder.encode("internal");
- query += "&cloningInstance=" + URLEncoder.encode(cloneInstanceId);
- query += "&cloneSameMachine=true";
- query += "&AdminUserPassword=" + URLEncoder.encode(adminPWD);
- query += "&certType=" + URLEncoder.encode(certType);
- query += "&instanceID=" + URLEncoder.encode(instanceID);
- query += "&opType=" + URLEncoder.encode("OP_MODIFY");
- query += "&taskID=" + URLEncoder.encode("taskCloning");
- query += "&cmsSeed=0";
- setPostQueryString(query);
- return Connect(myStringUrl);
- }
-
private boolean setSerial(String start, String end) {
System.out.println("configuring Cert Instance : setCASerial");
setConfigURL();
@@ -872,25 +818,6 @@ public class AutoInstaller {
}
- private boolean serverMigration() {
- System.out.println("configuring Cert Instance : Server migration");
- setConfigURL();
- String myStringUrl = "http://" + host + ":" + adminPort + configURL;
-
- System.out.println(myStringUrl);
- String query = "AdminUserPassword=" + URLEncoder.encode(adminPWD);
-
- query += "&";
- query += "instanceID=" + URLEncoder.encode(instanceID);
- query += "&migrationEnable=" + URLEncoder.encode("false");
- query += "&opType=" + URLEncoder.encode("OP_MODIFY");
- query += "&taskID=" + URLEncoder.encode("migration");
- query += "&cmsSeed=0";
- setPostQueryString(query);
- return Connect(myStringUrl);
-
- }
-
private boolean initializePWD() {
System.out.println("configuring Cert Instance : Initialize token");
setConfigURL();
@@ -1570,32 +1497,6 @@ public class AutoInstaller {
return Connect(myStringUrl);
}
- private boolean setupKRAAgents() {
- System.out.println("configuring Cert Instance : KRA Agents");
- setConfigURL();
- String myStringUrl = "http://" + host + ":" + adminPort + configURL;
-
- System.out.println(myStringUrl);
- String query = "AdminUserPassword=" + URLEncoder.encode(adminPWD);
-
- query += "&";
- query += "instanceID=" + URLEncoder.encode(instanceID);
- query += "&serverRoot=" + URLEncoder.encode(serverRoot);
- query += "&opType=" + URLEncoder.encode("OP_MODIFY");
- query += "&taskID=" + URLEncoder.encode("agents");
- query += "&n=" + URLEncoder.encode("3");
- query += "&m=" + URLEncoder.encode("2");
- query += "&uid2=" + URLEncoder.encode("agent3");
- query += "&uid0=" + URLEncoder.encode("agent1");
- query += "&uid1=" + URLEncoder.encode("agent2");
- query += "&pwd1=" + URLEncoder.encode("netscape");
- query += "&pwd2=" + URLEncoder.encode("netscape");
- query += "&pwd0=" + URLEncoder.encode("netscape");
- query += "&cmsSeed=0";
- setPostQueryString(query);
- return Connect(myStringUrl);
- }
-
private boolean ConfRA() {
// Start Configuring
@@ -2230,116 +2131,6 @@ public class AutoInstaller {
// Configure Clone
- private boolean ConfClone() {
- // Start Configuring
-
- // Step 1. Start Deamon
-
- if (!startDeamon()) {
- System.out.println(
- "Configuring Cert Instance: Unable to start deamon");
- return false;
- }
-
- // Sometimes it takes time to start deamon so wait for few seconds
- try {
- System.out.println("going to sleep for 10 seconds");
- Thread.sleep(10000);
- } catch (InterruptedException ie) {
- System.out.println("sleep exection");
- }
-
- // Step 1a: Initialize Token ( Changed in 6.0)jjj
- if (!initializePWD()) {
- System.out.println(
- "Configuring Cert Instance: error initializing pwd token");
- return false;
- }
-
- // Step 2. Configure Internal DB
- if (!configInternalDB()) {
- System.out.println(
- "Configuring Cert Instance: error configuring internal db");
- return false;
- }
-
- // Step 3. Create Admin Values
- if (!createAdminValues()) {
- System.out.println(
- "Configuring Cert Instance: error configuring admin values ");
- return false;
- }
-
- // Step 4. SubSystems
-
- if (!selectSubSystem()) {
- System.out.println(
- "Configuring Cert Instance: error selecting subsystems");
- return false;
- }
-
- // Step 5. SetCASerial
- if (!setSerial("1000000", "2000000")) {
- System.out.println("Configuring Cert Instance: error setSerial");
- return false;
- }
-
- if (!setOCSP()) {
- System.out.println("Configuring Cert Instance: error setOCSP");
- return false;
- }
-
- // Step 5. Network Configuration
- if (!networkConfig()) {
- System.out.println(
- "Configuring Cert Instance: error configuring network ports ");
- return false;
- }
-
- if (!taskCloning()) {
- System.out.println("Configuring Cert Instance: error Task Cloning ");
- return false;
- }
-
- if (!taskCloneMaster()) {
- System.out.println(
- "Configuring Cert Instance: error configuring network ports ");
- return false;
- }
-
- // Create a SSL signing cert
- certType = "serverCert";
-
- if (!taskCloning()) {
- System.out.println("Configuring Cert Instance: error Task Cloning ");
- return false;
- }
-
- // Step 11
- if (!singleSignON()) {
- System.out.println(
- "Configuring Cert Instance: error setting up singlesignon");
- return false;
- }
-
- // Step 11
- if (!doMisc()) {
- System.out.println(
- "Configuring Cert Instance: error setting up miscell");
- return false;
- }
-
- // Step 12
- if (!exitDeamon()) {
- System.out.println(
- "Configuring Cert Instance: Unable to exit deamon");
- return false;
- }
-
- return true;
-
- }
-
public boolean readProperties() {
// Read the properties file and assign values to variables .
try {
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 6913a1440..94c57a62c 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java
@@ -40,20 +40,6 @@ public class CMSConfig extends ServerInfo {
readCMSConfig();
}
- private void getProperties(String filePath) throws Exception {
- try {
- FileInputStream fis = new FileInputStream(filePath);
-
- props = new CMSProperties();
- props.load(fis);
- System.out.println("Reading Properties file successful");
- fis.close();
- } catch (Exception e) {
- System.out.println("exception " + e.getMessage());
- }
-
- }
-
private void readCMSConfig() {
try {
@@ -517,51 +503,6 @@ public class CMSConfig extends ServerInfo {
CMSprops.setProperty("cardcryptogram.validate.enable", "false");
}
- private void ARLOn() {
- CMSprops.setProperty(
- "ca.crl.MasterCRL.extension.IssuingDistributionPoint.critical",
- "true");
- CMSprops.setProperty(
- "ca.crl.MasterCRL.extension.IssuingDistributionPoint.enable",
- "true");
- CMSprops.setProperty(
- "ca.crl.MasterCRL.extension.IssuingDistributionPoint.indirectCRL",
- "false");
- CMSprops.setProperty(
- "ca.crl.MasterCRL.extension.IssuingDistributionPoint.onlyContainsCACerts",
- "true");
- CMSprops.setProperty(
- "ca.crl.MasterCRL.extension.IssuingDistributionPoint.onlyContainsUserCerts",
- "false");
- CMSprops.setProperty(
- "ca.crl.MasterCRL.extension.IssuingDistributionPoint.onlySomeReasons",
- null);
- CMSprops.setProperty(
- "ca.crl.MasterCRL.extension.IssuingDistributionPoint.pointName",
- null);
- CMSprops.setProperty(
- "ca.crl.MasterCRL.extension.IssuingDistributionPoint.pointType",
- "DirectoryName");
- CMSprops.setProperty(
- "ca.crl.MasterCRL.extension.IssuingDistributionPoint.type",
- "CRLExtension");
- CMSprops.setProperty("ca.crl.MasterCRL.allowExtensions", "true");
- CMSprops.setProperty("ca.crl.MasterCRL.alwaysUpdate", "true");
- CMSprops.setProperty("ca.crl.MasterCRL.autoUpdateInterval", "5");
- CMSprops.setProperty("ca.crl.MasterCRL.caCertsOnly", "true");
- CMSprops.setProperty("ca.crl.MasterCRL.cacheUpdateInterval", "5");
- CMSprops.setProperty("ca.crl.MasterCRL.class",
- "com.netscape.cmscore.ca.CRLIssuingPoint");
-
- CMSprops.setProperty("ca.crl.MasterCRL.description",
- "CA's complete Certificate Revocation List");
- CMSprops.setProperty("ca.crl.MasterCRL.enableCRLCache", "true");
- CMSprops.setProperty("ca.crl.MasterCRL.includeExpiredCerts", "true");
- CMSprops.setProperty("ca.crl.MasterCRL.nextUpdateSkew", "5");
- CMSprops.setProperty("ca.crl.MasterCRL.signingAlgorithm", "SHA1withRSA");
-
- }
-
// Policies
public void DefaultValidityRule(String SubsystemType, String lagtime, String leadtime, String maxValidity) {
if (SubsystemType.equals("ca")) {
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 51dbd2127..038ec42f9 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
@@ -98,17 +98,6 @@ public class CMSLDAP {
}
- private boolean RemoveInstance(String basedn) {
- try {
- conn.delete(basedn);
- return true;
- } catch (Exception e) {
- System.out.println("ERROR: " + e.toString());
- return false;
- }
-
- }
-
/**
* Search for certificaterevocationList attribute. Takes basedn and filter as parameters
*/
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 89fa768ca..c353c4ae8 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
@@ -252,20 +252,6 @@ public class ServerInfo {
}
}
- private void getProperties(String filePath) throws Exception {
- try {
- FileInputStream fis = new FileInputStream(filePath);
-
- props = new CMSProperties();
- props.load(fis);
- System.out.println("Reading Properties file successful");
- fis.close();
- } catch (Exception e) {
- System.out.println("exception " + e.getMessage());
- }
-
- }
-
private String stripSpace(String s) {
String val = "";
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 fc2668565..d711e409e 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java
@@ -19,10 +19,8 @@ package com.netscape.pkisilent.common;
import java.io.BufferedReader;
import java.io.FileInputStream;
-import java.io.IOException;
import java.io.InputStreamReader;
import java.net.ServerSocket;
-import java.net.Socket;
import java.util.Properties;
import org.mozilla.jss.crypto.X509Certificate;
@@ -468,20 +466,6 @@ public class TestClient implements SSLCertificateApprovalCallback {
return s;
}
- private static boolean isSocketUnused(String h, int p) {
-
- try {
-
- Socket ss = new Socket(h, p);
-
- ss.close();
- return false;
-
- } catch (IOException e) {
- return true;
- }
- }
-
/**
* returns FreePort in this machine . Takes a parmater portnumber. For example getFreePort("4026").
*/
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 fa402cf61..cd6ebd878 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
@@ -155,10 +155,6 @@ public class UserEnroll extends TestClient {
certType = ct;
}
- private long getElapsedTime() {
- return elapsedTime;
- }
-
public boolean enroll_load() {
buildquery();
setStatusString("");