2006-05-20 Raif S. Naffah <raif@swiftdsl.com.au>

	* tools/gnu/classpath/tools/keytool/ListCmd.java (rfc):
	Increased visibility.
	(setup): Do not trace/log passwords.
	(parsed): Was not setting correct (rfc) field; fixed.
	(print1Chain): Formatting.
	* tools/gnu/classpath/tools/keytool/DeleteCmd.java (setup):
	Do not trace/log passwords.
	* tools/gnu/classpath/tools/keytool/ExportCmd.java (setup): Likewise.
	* tools/gnu/classpath/tools/keytool/GenKeyCmd.java (setup): Likewise.
	* tools/gnu/classpath/tools/keytool/IdentityDBCmd.java (setup): Likewise.
	* tools/gnu/classpath/tools/keytool/KeyCloneCmd.java (setup): Likewise.
	* tools/gnu/classpath/tools/keytool/StorePasswdCmd.java (setup): Likewise.
	* tools/gnu/classpath/tools/keytool/ImportCmd.java (setup): Likewise.
	(orderChain): Added FIXME.
	* tools/gnu/classpath/tools/keytool/CertReqCmd.java (setup):
	Do not trace/log passwords.
	Removed commented out code.
	* tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java (setup): Likewise.
	* tools/gnu/classpath/tools/keytool/SelfCertCmd.java (setup): Likewise.
	* tools/gnu/classpath/tools/keytool/Command.java (doCommand): Formatting.
	(setKeystoreURLParam): Likewise.
	(setKeystorePasswordParam): Do not trace/log passwords.
	(saveKeyStore): Likewise.

12 files changed, 13 insertions, 38 deletions

diff --git a/tools/gnu/classpath/tools/keytool/CertReqCmd.java b/tools/gnu/classpath/tools/keytool/CertReqCmd.java
index 533d54cae..3de97e589 100644
--- a/tools/gnu/classpath/tools/keytool/CertReqCmd.java
+++ b/tools/gnu/classpath/tools/keytool/CertReqCmd.java
@@ -258,16 +258,13 @@ class CertReqCmd extends Command
     setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
     setAliasParam(_alias);
     setKeyPasswordNoPrompt(_password);
-//    setSignatureAlgorithm(_sigAlgorithm);
 
     log.finer("-certreq handler will use the following options:"); //$NON-NLS-1$
     log.finer("  -alias=" + alias); //$NON-NLS-1$
     log.finer("  -sigalg=" + _sigAlgorithm); //$NON-NLS-1$
     log.finer("  -file=" + _certReqFileName); //$NON-NLS-1$
-    log.finer("  -keypass=" + _password); //$NON-NLS-1$
     log.finer("  -storetype=" + storeType); //$NON-NLS-1$
     log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -storepass=" + String.valueOf(storePasswordChars)); //$NON-NLS-1$
     log.finer("  -provider=" + provider); //$NON-NLS-1$
     log.finer("  -v=" + verbose); //$NON-NLS-1$
     log.finer("  -attributes=" + nullAttributes); //$NON-NLS-1$
diff --git a/tools/gnu/classpath/tools/keytool/Command.java b/tools/gnu/classpath/tools/keytool/Command.java
index f1f79d5e4..0d8c56334 100644
--- a/tools/gnu/classpath/tools/keytool/Command.java
+++ b/tools/gnu/classpath/tools/keytool/Command.java
@@ -194,14 +194,14 @@ abstract class Command
   public void doCommand() throws Exception
   {
     try
-    {
-      setup();
-      start();
-    }
+      {
+        setup();
+        start();
+      }
     finally
-    {
-      teardown();
-    }
+      {
+        teardown();
+      }
   }
 
   /**
@@ -500,7 +500,6 @@ abstract class Command
         storePasswordChars = pcb.getPassword();
         pcb.clearPassword();
       }
-    log.finest("storePasswordChars = [" + String.valueOf(storePasswordChars)+ "]"); //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   /**
@@ -589,7 +588,7 @@ abstract class Command
     catch (IOException x)
     {
       log.fine("Exception while closing the key store input stream: " + x //$NON-NLS-1$
-                 + ". Ignore"); //$NON-NLS-1$
+               + ". Ignore"); //$NON-NLS-1$
     }
   }
 
@@ -984,7 +983,7 @@ abstract class Command
   protected void saveKeyStore(char[] password) throws IOException,
       KeyStoreException, NoSuchAlgorithmException, CertificateException
   {
-    log.entering(this.getClass().getName(), "saveKeyStore", String.valueOf(password)); //$NON-NLS-1$
+    log.entering(this.getClass().getName(), "saveKeyStore"); //$NON-NLS-1$
 
     URLConnection con = storeURL.openConnection();
     con.setDoOutput(true);
diff --git a/tools/gnu/classpath/tools/keytool/DeleteCmd.java b/tools/gnu/classpath/tools/keytool/DeleteCmd.java
index 8b07b3dcc..9022f1c20 100644
--- a/tools/gnu/classpath/tools/keytool/DeleteCmd.java
+++ b/tools/gnu/classpath/tools/keytool/DeleteCmd.java
@@ -163,7 +163,6 @@ class DeleteCmd extends Command
     log.finer("  -alias=" + alias); //$NON-NLS-1$
     log.finer("  -storetype=" + storeType); //$NON-NLS-1$
     log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -storepass=" + String.valueOf(storePasswordChars)); //$NON-NLS-1$
     log.finer("  -provider=" + provider); //$NON-NLS-1$
     log.finer("  -v=" + verbose); //$NON-NLS-1$
   }
diff --git a/tools/gnu/classpath/tools/keytool/ExportCmd.java b/tools/gnu/classpath/tools/keytool/ExportCmd.java
index 1cb2e2e05..49582a944 100644
--- a/tools/gnu/classpath/tools/keytool/ExportCmd.java
+++ b/tools/gnu/classpath/tools/keytool/ExportCmd.java
@@ -194,7 +194,6 @@ class ExportCmd extends Command
     log.finer("  -file=" + _certFileName); //$NON-NLS-1$
     log.finer("  -storetype=" + storeType); //$NON-NLS-1$
     log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -storepass=" + String.valueOf(storePasswordChars)); //$NON-NLS-1$
     log.finer("  -provider=" + provider); //$NON-NLS-1$
     log.finer("  -rfc=" + rfc); //$NON-NLS-1$
     log.finer("  -v=" + verbose); //$NON-NLS-1$
diff --git a/tools/gnu/classpath/tools/keytool/GenKeyCmd.java b/tools/gnu/classpath/tools/keytool/GenKeyCmd.java
index 7d0eebe5d..4d4ca7a74 100644
--- a/tools/gnu/classpath/tools/keytool/GenKeyCmd.java
+++ b/tools/gnu/classpath/tools/keytool/GenKeyCmd.java
@@ -316,11 +316,9 @@ class GenKeyCmd extends Command
     log.finer("  -keysize=" + keySize); //$NON-NLS-1$
     log.finer("  -sigalg=" + signatureAlgorithm.getAlgorithm()); //$NON-NLS-1$
     log.finer("  -dname=" + distinguishedName); //$NON-NLS-1$
-    log.finer("  -keypass=" + String.valueOf(keyPasswordChars)); //$NON-NLS-1$
     log.finer("  -validity=" + validityInDays); //$NON-NLS-1$
     log.finer("  -storetype=" + storeType); //$NON-NLS-1$
     log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -storepass=" + String.valueOf(storePasswordChars)); //$NON-NLS-1$
     log.finer("  -provider=" + provider); //$NON-NLS-1$
     log.finer("  -v=" + verbose); //$NON-NLS-1$
   }
diff --git a/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java b/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java
index b584e06db..11d0f68da 100644
--- a/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java
+++ b/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java
@@ -154,7 +154,6 @@ class IdentityDBCmd extends Command
     log.finer("  -file=" + _idbFileName); //$NON-NLS-1$
     log.finer("  -storetype=" + storeType); //$NON-NLS-1$
     log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -storepass=" + new String(storePasswordChars)); //$NON-NLS-1$
     log.finer("  -provider=" + provider); //$NON-NLS-1$
     log.finer("  -v=" + verbose); //$NON-NLS-1$
   }
diff --git a/tools/gnu/classpath/tools/keytool/ImportCmd.java b/tools/gnu/classpath/tools/keytool/ImportCmd.java
index 70bf49f01..2d587be08 100644
--- a/tools/gnu/classpath/tools/keytool/ImportCmd.java
+++ b/tools/gnu/classpath/tools/keytool/ImportCmd.java
@@ -274,12 +274,10 @@ class ImportCmd extends Command
     log.finer("-import handler will use the following options:"); //$NON-NLS-1$
     log.finer("  -alias=" + alias); //$NON-NLS-1$
     log.finer("  -file=" + _certFileName); //$NON-NLS-1$
-    log.finer("  -keypass=" + _password); //$NON-NLS-1$
     log.finer("  -noprompt=" + noPrompt); //$NON-NLS-1$
     log.finer("  -trustcacerts=" + trustCACerts); //$NON-NLS-1$
     log.finer("  -storetype=" + storeType); //$NON-NLS-1$
     log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -storepass=" + String.valueOf(storePasswordChars)); //$NON-NLS-1$
     log.finer("  -provider=" + provider); //$NON-NLS-1$
     log.finer("  -v=" + verbose); //$NON-NLS-1$
   }
@@ -675,7 +673,7 @@ class ImportCmd extends Command
     log.entering(this.getClass().getName(), "orderChain"); //$NON-NLS-1$
 
     LinkedList result = new LinkedList();
-    
+    // FIXME: really order it!
 
     log.entering(this.getClass().getName(), "orderChain", result); //$NON-NLS-1$
     return result;
diff --git a/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java b/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java
index 924cbcf3c..a60fef936 100644
--- a/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java
+++ b/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java
@@ -209,16 +209,12 @@ class KeyCloneCmd extends Command
     setAliasParam(_alias);
     setKeyPasswordNoPrompt(_password);
     setDestinationAlias(_destAlias);
-//    setNewKeyPassword(_newPassword);
 
     log.finer("-keyclone handler will use the following options:"); //$NON-NLS-1$
     log.finer("  -alias=" + alias); //$NON-NLS-1$
     log.finer("  -dest=" + destinationAlias); //$NON-NLS-1$
-    log.finer("  -keypass=" + _password); //$NON-NLS-1$
-    log.finer("  -new=" + _newPassword); //$NON-NLS-1$
     log.finer("  -storetype=" + storeType); //$NON-NLS-1$
     log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -storepass=" + String.valueOf(storePasswordChars)); //$NON-NLS-1$
     log.finer("  -provider=" + provider); //$NON-NLS-1$
     log.finer("  -v=" + verbose); //$NON-NLS-1$
   }
diff --git a/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java b/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java
index 58197a3ab..5cf25eb0f 100644
--- a/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java
+++ b/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java
@@ -195,15 +195,12 @@ class KeyPasswdCmd extends Command
     setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
     setAliasParam(_alias);
     setKeyPasswordNoPrompt(_password);
-//    setNewKeyPassword(_newPassword);
 
     log.finer("-keypasswd handler will use the following options:"); //$NON-NLS-1$
     log.finer("  -alias=" + alias); //$NON-NLS-1$
-    log.finer("  -keypass=" + _password); //$NON-NLS-1$
     log.finer("  -new=" + _newPassword); //$NON-NLS-1$
     log.finer("  -storetype=" + storeType); //$NON-NLS-1$
     log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -storepass=" + String.valueOf(storePasswordChars)); //$NON-NLS-1$
     log.finer("  -provider=" + provider); //$NON-NLS-1$
     log.finer("  -v=" + verbose); //$NON-NLS-1$
   }
diff --git a/tools/gnu/classpath/tools/keytool/ListCmd.java b/tools/gnu/classpath/tools/keytool/ListCmd.java
index 4f6f47185..674099307 100644
--- a/tools/gnu/classpath/tools/keytool/ListCmd.java
+++ b/tools/gnu/classpath/tools/keytool/ListCmd.java
@@ -123,7 +123,7 @@ class ListCmd extends Command
   protected String _ksURL;
   protected String _ksPassword;
   protected String _providerClassName;
-  private boolean rfc;
+  protected boolean rfc;
   private boolean all;
 
   // default 0-arguments constructor
@@ -190,7 +190,6 @@ class ListCmd extends Command
     log.finer("  -alias=" + alias); //$NON-NLS-1$
     log.finer("  -storetype=" + storeType); //$NON-NLS-1$
     log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -storepass=" + String.valueOf(storePasswordChars)); //$NON-NLS-1$
     log.finer("  -provider=" + provider); //$NON-NLS-1$
     log.finer("  -v=" + verbose); //$NON-NLS-1$
     log.finer("  -rfc=" + rfc); //$NON-NLS-1$
@@ -292,7 +291,7 @@ class ListCmd extends Command
     {
       public void parsed(String argument) throws OptionException
       {
-        verbose = true;
+        rfc = true;
       }
     });
     result.add(options);
@@ -359,7 +358,7 @@ class ListCmd extends Command
   private void print1Chain(Certificate[] chain, PrintWriter writer)
       throws CertificateEncodingException
   {
-    if (!verbose && !rfc)
+    if (! verbose && ! rfc)
       fingerprint(chain[0], writer);
     else
       {
diff --git a/tools/gnu/classpath/tools/keytool/SelfCertCmd.java b/tools/gnu/classpath/tools/keytool/SelfCertCmd.java
index 13a63d817..418bce49f 100644
--- a/tools/gnu/classpath/tools/keytool/SelfCertCmd.java
+++ b/tools/gnu/classpath/tools/keytool/SelfCertCmd.java
@@ -263,19 +263,15 @@ class SelfCertCmd extends Command
     setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
     setAliasParam(_alias);
     setKeyPasswordNoPrompt(_password);
-//    setDName(_dName);
     setValidityParam(_validityStr);
-//    setSignatureAlgorithm(_sigAlgorithm);
 
     log.finer("-selfcert handler will use the following options:"); //$NON-NLS-1$
     log.finer("  -alias=" + alias); //$NON-NLS-1$
     log.finer("  -sigalg=" + _sigAlgorithm); //$NON-NLS-1$
     log.finer("  -dname=" + _dName); //$NON-NLS-1$
-    log.finer("  -keypass=" + _password); //$NON-NLS-1$
     log.finer("  -validity=" + validityInDays); //$NON-NLS-1$
     log.finer("  -storetype=" + storeType); //$NON-NLS-1$
     log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -storepass=" + String.valueOf(storePasswordChars)); //$NON-NLS-1$
     log.finer("  -provider=" + provider); //$NON-NLS-1$
     log.finer("  -v=" + verbose); //$NON-NLS-1$
   }
diff --git a/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java b/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java
index 988c1636a..e9262bd71 100644
--- a/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java
+++ b/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java
@@ -161,10 +161,8 @@ class StorePasswdCmd extends Command
     setNewKeystorePassword(_newPassword);
 
     log.finer("-storepasswd handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -new=" + String.valueOf(newStorePasswordChars)); //$NON-NLS-1$
     log.finer("  -storetype=" + storeType); //$NON-NLS-1$
     log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -storepass=" + String.valueOf(storePasswordChars)); //$NON-NLS-1$
     log.finer("  -provider=" + provider); //$NON-NLS-1$
     log.finer("  -v=" + verbose); //$NON-NLS-1$
   }