You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by od...@apache.org on 2007/01/05 19:19:36 UTC
svn commit: r493115 - in /harmony/enhanced/classlib/trunk/modules/tools/src:
main/java/org/apache/harmony/tools/jarsigner/
main/java/org/apache/harmony/tools/keytool/
test/java/org/apache/harmony/tools/keytool/tests/
Author: odeakin
Date: Fri Jan 5 10:19:32 2007
New Revision: 493115
URL: http://svn.apache.org/viewvc?view=rev&rev=493115
Log:
Apply patch HARMONY-2813 ([Classlib][tools] Wrong words in tools module)
I made one change, in ArgumentsParser.java, I believe the first fixed comment should read "additional options". Apart from that all other changes applied straight.
Modified:
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/ArgParser.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSHelper.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/TimeStampGenerator.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/UserInteractor.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/ArgumentsParser.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CRLManager.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertChainVerifier.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertImporter.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertReader.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/HelpPrinter.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreCertPrinter.java
harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java
harmony/enhanced/classlib/trunk/modules/tools/src/test/java/org/apache/harmony/tools/keytool/tests/GenKeyTest.java
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/ArgParser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/ArgParser.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/ArgParser.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/ArgParser.java Fri Jan 5 10:19:32 2007
@@ -296,7 +296,7 @@
if (param.getStorePass() == null) {
param.setStorePass(UserInteractor
.getDataFromUser("Enter keystore password: "));
- // ckeck the password
+ // check the password
param.getKeyStore();
}
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSHelper.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSHelper.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSHelper.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSHelper.java Fri Jan 5 10:19:32 2007
@@ -55,7 +55,7 @@
buf.append("\n-silent \t\t\t provide as few output as possible");
buf.append("\n-certs \t\t\t\t display certificates ");
- buf.append("(use with -veify and -verbose)");
+ buf.append("(use with -verify and -verbose)");
buf.append("\n-tsa <TSA_URL>\t\t\t location of time-stamp authority");
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java Fri Jan 5 10:19:32 2007
@@ -32,7 +32,7 @@
import org.apache.harmony.tools.toolutils.KeyStoreLoaderSaver;
/**
- * The class encapsulates paramaters for jarsigner most of which are ususally
+ * The class encapsulates paramaters for jarsigner most of which are usually
* given in command line.
*/
class JSParameters {
@@ -129,7 +129,7 @@
// timestamp authority URL
private URI tsaURI;
- // the alias identifiing the TSA's certificate
+ // the alias identifying the TSA's certificate
private String tsaCertAlias;
// alternative signer class name
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/TimeStampGenerator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/TimeStampGenerator.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/TimeStampGenerator.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/TimeStampGenerator.java Fri Jan 5 10:19:32 2007
@@ -148,7 +148,7 @@
msgImprint, // message imprint
null, // not asking for a particular policy
nonce, // nonce
- Boolean.FALSE, // don't need the certificte inside the stamp
+ Boolean.FALSE, // don't need the certificate inside the stamp
null); // no extensions
return req.getEncoded();
}
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/UserInteractor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/UserInteractor.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/UserInteractor.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/jarsigner/UserInteractor.java Fri Jan 5 10:19:32 2007
@@ -39,7 +39,7 @@
private static int newLineLength = 2;
// Prints prompt and waits the user to enter the needed data,
- // tha data is returned.
+ // the data is returned.
static char[] getDataFromUser(String prompt) throws IOException {
System.out.println(prompt);
charsRead = in.read(readData);
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/ArgumentsParser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/ArgumentsParser.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/ArgumentsParser.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/ArgumentsParser.java Fri Jan 5 10:19:32 2007
@@ -85,7 +85,7 @@
final static String sHelp = "-help";
- // addititanal options
+ // additional options
final static String sKeystore = "-keystore";
final static String sStoretype = "-storetype";
@@ -681,7 +681,7 @@
// the flag is set to true, when the user confirms that
// the data he (or she) entered is correct.
boolean isCorrect = false;
- // X.500 Dinsinguished Name. It will look like:
+ // X.500 Distinguished Name. It will look like:
// "CN=user_name, OU=org_unit, O=organization, L=city, ST=state,
// C=com"
StringBuffer dname = new StringBuffer(256);
@@ -905,7 +905,7 @@
System
.arraycopy(readData, 0, keyPass, 0, charsRead
- newLineLength);
- // if the new password is incorrect an axception will be thrown
+ // if the new password is incorrect an exception will be thrown
try {
keyStore.getKey(alias, keyPass);
} catch (NoSuchAlgorithmException nsae) {
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CRLManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CRLManager.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CRLManager.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CRLManager.java Fri Jan 5 10:19:32 2007
@@ -38,7 +38,7 @@
* is stored in the file. If the file name is not given, stdin is used.
* File with CRL and the checked certificate file are specified in param.
*
- * @return true if found at least one revoked certifiacte
+ * @return true if found at least one revoked certificate
* @param param
* @throws IOException
* @throws CRLException
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertChainVerifier.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertChainVerifier.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertChainVerifier.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertChainVerifier.java Fri Jan 5 10:19:32 2007
@@ -51,7 +51,7 @@
import javax.security.auth.x500.X500Principal;
/**
- * A class for checking X.509 certifcicates and building and verifying X.509
+ * A class for checking X.509 certificates and building and verifying X.509
* certificate chains.
*/
public class CertChainVerifier {
@@ -297,7 +297,7 @@
}
/**
- * Build a certificte chain up to the trust anchor, based on trusted
+ * Build a certificate chain up to the trust anchor, based on trusted
* certificates contained in the keystore and possibly cacerts file (if
* param.isTrustCACerts() returns true).
*
@@ -326,7 +326,7 @@
return buildCertPath(certProvider, newCert, selfSignedTAs, trustedCerts);
}
- // Build a certificte chain up to the self-signed trust anchor, based on
+ // Build a certificate chain up to the self-signed trust anchor, based on
// trusted certificates given.
//
// @param certProvider
@@ -336,7 +336,7 @@
// are used as trust anchors.
// @param trustedCerts
// elements of trustedCerts are used as chain links It can be
- // null if no intermediate certifictaes allowed.
+ // null if no intermediate certificates allowed.
private static CertPathBuilderResult buildCertPath(String certProvider,
X509Certificate newCert, Set selfSignedTAs, Collection trustedCerts)
throws NoSuchAlgorithmException, CertificateException, IOException,
@@ -409,12 +409,12 @@
// Separates the trusted certificates from keystore (and cacerts file if
// "-trustcacerts" option is specified) into self-signed certificate
- // authority certificates and non-self-signed certifcates.
+ // authority certificates and non-self-signed certificates.
// @return - Returns an array of Collection-s.
// The first element of the array is Set<TrustAnchors> - self-signed CAs.
- // The second - ArrayList of non-self-signed trusted certifcates.
+ // The second - ArrayList of non-self-signed trusted certificates.
// The third - ArrayList of self-signed certificates which correspond to
- // TrustAnchors containied in the first element of the array.
+ // TrustAnchors contained in the first element of the array.
private static Collection[] separateTrusted(KeytoolParameters param)
throws KeyStoreException, FileNotFoundException, IOException,
NoSuchAlgorithmException, CertificateException, KeytoolException,
@@ -440,7 +440,7 @@
Set selfSignedTAs = null;
// certificates of selfSignedTAs
Collection selfSignedTAsCerts = null;
- // trusted certiifcates which can be the chain links of the CertPath
+ // trusted certificates which can be the chain links of the CertPath
Collection trustedCerts = null;
try {
keyStoreBuilderParam = new PKIXBuilderParameters(param
@@ -562,7 +562,7 @@
static X509Certificate[] orderChain(Collection<X509Certificate> certs,
PublicKey aliasPubKey) throws KeytoolException {
- String strOrderFailed = "Failed to order the certiticate chain.";
+ String strOrderFailed = "Failed to order the certificate chain.";
// add certificates to the certstore to ease the search
CollectionCertStoreParameters chainCCSParams = new CollectionCertStoreParameters(
@@ -694,7 +694,7 @@
*
* @param param
* @param cert
- * @return true if the certificate is trused, false - otherwise.
+ * @return true if the certificate is trusted, false - otherwise.
* @throws FileNotFoundException
* @throws NoSuchAlgorithmException
* @throws CertificateException
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertImporter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertImporter.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertImporter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertImporter.java Fri Jan 5 10:19:32 2007
@@ -34,7 +34,7 @@
/**
* Class for importing certificates - adding to trusted certificates or
- * Certificate Signing Request (CSR) replies from certificate authorirties
+ * Certificate Signing Request (CSR) replies from certificate authorities
* (CAs). CSR reply can be a single X.509 certificate or a PKCS#7-formatted
* certificate chain containing X.509 certificates. X.509 v1, v2 and v3
* certificates are supported. Certificates to import can be in binary (DER) or
@@ -257,7 +257,7 @@
/**
* Imports a PKCS#7-formatted certificate chain as a CSR reply. The
- * certificte chain is firstly ordered. After that top-level certificate of
+ * certificate chain is firstly ordered. After that top-level certificate of
* the chain is checked to be a trusted one. If it is not a trusted
* certificate, the user is asked if the certificate should be trusted. If
* the certificate is considered to be trusted, old certificate chain,
@@ -283,7 +283,7 @@
String alias = param.getAlias();
KeyStore keyStore = param.getKeyStore();
- // get the public key of the certiciate, associated with alias,
+ // get the public key of the certificate, associated with alias,
// to import reply to.
PublicKey publicKey = keyStore.getCertificate(alias).getPublicKey();
// order the certificate chain
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertReader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertReader.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertReader.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/CertReader.java Fri Jan 5 10:19:32 2007
@@ -43,7 +43,7 @@
/**
* Reads an X.509 certificate or a certificate chain from the file with the
* given name or from stdin if the fileName is null and generates a
- * collection of Certifices.
+ * collection of Certificates.
*
* @param fileName
* @param readOnlyFirst
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/HelpPrinter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/HelpPrinter.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/HelpPrinter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/HelpPrinter.java Fri Jan 5 10:19:32 2007
@@ -197,7 +197,7 @@
topicMsg
.append(" If \"-ca\" option is specified, generated certificate\n");
topicMsg
- .append(" will can be used for signing another certifictes.\n");
+ .append(" will can be used for signing another certificates.\n");
topicMsg
.append(" If \"-secretkey\" option is specified, a secret key will.\n");
topicMsg
@@ -274,7 +274,7 @@
topicMsg
.append(" If \"-ca\" option is specified, generated certificate\n");
topicMsg
- .append(" will can be used for signing another certifictes.\n");
+ .append(" will can be used for signing another certificates.\n");
topicMsg
.append(" If \"-secretkey\" option is specified, a secret key will.\n");
topicMsg
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java Fri Jan 5 10:19:32 2007
@@ -183,7 +183,7 @@
int keySize = param.getKeySize();
if (param.isVerbose()) {
- StringBuffer strBuf = new StringBuffer("Genarating a " + keyAlg
+ StringBuffer strBuf = new StringBuffer("Generating a " + keyAlg
+ " key pair, key length " + keySize + " bit \nand a ");
if (selfSigned) {
strBuf.append("self-signed ");
@@ -298,7 +298,7 @@
"Cannot find the algorithm to recover the key. ", e);
}
- // get the cersificate currently associated with the alias
+ // get the certificate currently associated with the alias
X509Certificate existing = (X509Certificate) keyStore
.getCertificate(alias);
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreCertPrinter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreCertPrinter.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreCertPrinter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreCertPrinter.java Fri Jan 5 10:19:32 2007
@@ -327,7 +327,7 @@
Iterator certIter = certCollection.iterator();
int counter = 1;
- // print the datailed info on all certificates
+ // print the detailed info on all certificates
while (certIter.hasNext()) {
X509Certificate cert = (X509Certificate) certIter.next();
System.out.println("\nCertificate[" + counter + "]:");
@@ -340,7 +340,7 @@
private static String formatBytes(byte[] bytes) {
int i;
// The method is expected to format mostly message digest results and
- // the length of the String repesenting a SHA1 digest printed in
+ // the length of the String representing a SHA1 digest printed in
// the way: "0A:1B:C3:D4:....:E5" is the biggest and is 59.
StringBuffer buffer = new StringBuffer(59);
int length;
@@ -366,4 +366,5 @@
return new String(buffer);
}
}
+
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java Fri Jan 5 10:19:32 2007
@@ -29,7 +29,7 @@
import org.apache.harmony.tools.toolutils.KeyStoreLoaderSaver;
/**
- * The class encapsulates paramaters for Keytool most of which are ususally given
+ * The class encapsulates paramaters for Keytool most of which are usually given
* in command line.
*/
public class KeytoolParameters {
Modified: harmony/enhanced/classlib/trunk/modules/tools/src/test/java/org/apache/harmony/tools/keytool/tests/GenKeyTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/test/java/org/apache/harmony/tools/keytool/tests/GenKeyTest.java?view=diff&rev=493115&r1=493114&r2=493115
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/test/java/org/apache/harmony/tools/keytool/tests/GenKeyTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/test/java/org/apache/harmony/tools/keytool/tests/GenKeyTest.java Fri Jan 5 10:19:32 2007
@@ -116,7 +116,7 @@
assertTrue(errMsgPrefix + "alias " + curAlias
+ " does not exist in keystore", keyStore
.containsAlias(curAlias));
- assertTrue(errMsgPrefix + "alais " + curAlias
+ assertTrue(errMsgPrefix + "alias " + curAlias
+ " is not a key entry", keyStore.isKeyEntry(curAlias));
Key key = keyStore.getKey(curAlias, TestUtils.keyPass
.toCharArray());