Index: src/test/java/org/apache/harmony/tools/keytool/tests/GenKeyTest.java =================================================================== --- src/test/java/org/apache/harmony/tools/keytool/tests/GenKeyTest.java (revision 488981) +++ src/test/java/org/apache/harmony/tools/keytool/tests/GenKeyTest.java (working copy) @@ -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()); Index: src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java =================================================================== --- src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java (working copy) @@ -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 Index: src/main/java/org/apache/harmony/tools/jarsigner/ArgParser.java =================================================================== --- src/main/java/org/apache/harmony/tools/jarsigner/ArgParser.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/jarsigner/ArgParser.java (working copy) @@ -296,7 +296,7 @@ if (param.getStorePass() == null) { param.setStorePass(UserInteractor .getDataFromUser("Enter keystore password: ")); - // ckeck the password + // check the password param.getKeyStore(); } Index: src/main/java/org/apache/harmony/tools/jarsigner/UserInteractor.java =================================================================== --- src/main/java/org/apache/harmony/tools/jarsigner/UserInteractor.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/jarsigner/UserInteractor.java (working copy) @@ -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); Index: src/main/java/org/apache/harmony/tools/jarsigner/TimeStampGenerator.java =================================================================== --- src/main/java/org/apache/harmony/tools/jarsigner/TimeStampGenerator.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/jarsigner/TimeStampGenerator.java (working copy) @@ -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(); } Index: src/main/java/org/apache/harmony/tools/jarsigner/JSHelper.java =================================================================== --- src/main/java/org/apache/harmony/tools/jarsigner/JSHelper.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/jarsigner/JSHelper.java (working copy) @@ -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 \t\t\t location of time-stamp authority"); Index: src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java =================================================================== --- src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java (working copy) @@ -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 { Index: src/main/java/org/apache/harmony/tools/keytool/CRLManager.java =================================================================== --- src/main/java/org/apache/harmony/tools/keytool/CRLManager.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/keytool/CRLManager.java (working copy) @@ -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 Index: src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java =================================================================== --- src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java (working copy) @@ -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); Index: src/main/java/org/apache/harmony/tools/keytool/CertImporter.java =================================================================== --- src/main/java/org/apache/harmony/tools/keytool/CertImporter.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/keytool/CertImporter.java (working copy) @@ -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 Index: src/main/java/org/apache/harmony/tools/keytool/CertReader.java =================================================================== --- src/main/java/org/apache/harmony/tools/keytool/CertReader.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/keytool/CertReader.java (working copy) @@ -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 Index: src/main/java/org/apache/harmony/tools/keytool/ArgumentsParser.java =================================================================== --- src/main/java/org/apache/harmony/tools/keytool/ArgumentsParser.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/keytool/ArgumentsParser.java (working copy) @@ -85,7 +85,7 @@ final static String sHelp = "-help"; - // addititanal options + // attitudinal 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) { Index: src/main/java/org/apache/harmony/tools/keytool/KeyStoreCertPrinter.java =================================================================== --- src/main/java/org/apache/harmony/tools/keytool/KeyStoreCertPrinter.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/keytool/KeyStoreCertPrinter.java (working copy) @@ -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; Index: src/main/java/org/apache/harmony/tools/keytool/CertChainVerifier.java =================================================================== --- src/main/java/org/apache/harmony/tools/keytool/CertChainVerifier.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/keytool/CertChainVerifier.java (working copy) @@ -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 - 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 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 Index: src/main/java/org/apache/harmony/tools/keytool/HelpPrinter.java =================================================================== --- src/main/java/org/apache/harmony/tools/keytool/HelpPrinter.java (revision 488981) +++ src/main/java/org/apache/harmony/tools/keytool/HelpPrinter.java (working copy) @@ -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