diff --git a/mozilla/security/jss/build_java.pl b/mozilla/security/jss/build_java.pl index 33ca27348ba..c6b406057df 100644 --- a/mozilla/security/jss/build_java.pl +++ b/mozilla/security/jss/build_java.pl @@ -177,7 +177,7 @@ sub build { open(MYOUTFILE, ">>MANIFEST.MF"); #open for write, append } - #*** Print freeform text, semicol required *** + #*** Print freeform text, semicolon required *** print MYOUTFILE <<"MyLabel"; Manifest-Version: 1.0 diff --git a/mozilla/security/jss/lib/jss.def b/mozilla/security/jss/lib/jss.def index 2e116050800..3d2cc612f73 100644 --- a/mozilla/security/jss/lib/jss.def +++ b/mozilla/security/jss/lib/jss.def @@ -42,7 +42,7 @@ LIBRARY jss4 ;- ;+# line on which it occurs. ;+# 3. Lines containing ";+" will have ";+" removed on SUN and LINUX. ;+# On AIX, lines containing ";+" will be removed. -;+# 4. For all unix platforms, the string ";;" will thave the ";;" removed. +;+# 4. For all unix platforms, the string ";;" will have the ";;" removed. ;+# 5. For all unix platforms, after the above processing has taken place, ;+# all characters after the first ";" on the line will be removed. ;+# And for AIX, the first ";" will also be removed. diff --git a/mozilla/security/jss/org/mozilla/jss/CryptoManager.java b/mozilla/security/jss/org/mozilla/jss/CryptoManager.java index 73c80372166..92b2b6b47de 100644 --- a/mozilla/security/jss/org/mozilla/jss/CryptoManager.java +++ b/mozilla/security/jss/org/mozilla/jss/CryptoManager.java @@ -56,7 +56,7 @@ import org.mozilla.jss.provider.java.security.JSSMessageDigestSpi; * Initialization is done with static methods, and must be done before * an instance can be created. All other operations are done with instance * methods. - * @version $Revision: 1.53 $ $Date: 2009-03-27 21:34:49 $ + * @version $Revision: 1.54 $ $Date: 2009-07-14 22:30:56 $ */ public final class CryptoManager implements TokenSupplier { @@ -895,9 +895,9 @@ public final class CryptoManager implements TokenSupplier * * @param values The options with which to initialize CryptoManager. * @exception org.mozilla.jss.util.KeyDatabaseException Unable to open - * the key database, or it was currupted. + * the key database, or it was corrupted. * @exception org.mozilla.jss.util.CertDatabaseException Unable - * to open the certificate database, or it was currupted. + * to open the certificate database, or it was corrupted. **/ public static synchronized void initialize( InitializationValues values ) throws diff --git a/mozilla/security/jss/org/mozilla/jss/PK11Finder.c b/mozilla/security/jss/org/mozilla/jss/PK11Finder.c index 1f594a9e072..58e0cd37ed6 100644 --- a/mozilla/security/jss/org/mozilla/jss/PK11Finder.c +++ b/mozilla/security/jss/org/mozilla/jss/PK11Finder.c @@ -785,7 +785,7 @@ static int find_leaf_cert( cur_link = leaf_link; } if (found == -1) { - /* the certificate chain is problemtic! */ + /* the certificate chain is problematic! */ status = 0; goto finish; } diff --git a/mozilla/security/jss/org/mozilla/jss/crypto/CryptoStore.java b/mozilla/security/jss/org/mozilla/jss/crypto/CryptoStore.java index 81ee939da3a..00d083939cf 100644 --- a/mozilla/security/jss/org/mozilla/jss/crypto/CryptoStore.java +++ b/mozilla/security/jss/org/mozilla/jss/crypto/CryptoStore.java @@ -82,7 +82,7 @@ public interface CryptoStore { * * @param key A PrivateKey to be permanently deleted. It must reside * on this token. - * @exception NoSuchItemOnTokenException If the given privae key does + * @exception NoSuchItemOnTokenException If the given private key does * not reside on this token. * @exception TokenException If an error occurs on the token while * deleting the key. diff --git a/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java b/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java index 36431b41aa9..66aca1a2d46 100644 --- a/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java +++ b/mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java @@ -131,7 +131,7 @@ public class KeyPairGenerator { * @param strength The strength of the keys that will be generated. * Usually this is the length of the key in bits. * @param random This parameter is ignored. NSS does not accept - * an exterrnal source of random numbers. + * an external source of random numbers. */ public void initialize(int strength, SecureRandom random) { engine.initialize(strength, random); diff --git a/mozilla/security/jss/org/mozilla/jss/crypto/PQGParams.c b/mozilla/security/jss/org/mozilla/jss/crypto/PQGParams.c index dd4a3e0e9ac..104cc0e70a5 100644 --- a/mozilla/security/jss/org/mozilla/jss/crypto/PQGParams.c +++ b/mozilla/security/jss/org/mozilla/jss/crypto/PQGParams.c @@ -338,7 +338,7 @@ Java_org_mozilla_jss_crypto_PQGParams_paramsAreValidNative PR_ASSERT(env!=NULL && this!=NULL); - /* clear the secitems so we can free them indiscriminately later */ + /* clear the SECItems so we can free them indiscriminately later */ ZERO_SECITEM(P); ZERO_SECITEM(Q); ZERO_SECITEM(G); diff --git a/mozilla/security/jss/org/mozilla/jss/crypto/PQGParams.java b/mozilla/security/jss/org/mozilla/jss/crypto/PQGParams.java index 649bca1261b..86b0cce5da8 100644 --- a/mozilla/security/jss/org/mozilla/jss/crypto/PQGParams.java +++ b/mozilla/security/jss/org/mozilla/jss/crypto/PQGParams.java @@ -46,7 +46,7 @@ import org.mozilla.jss.util.Assert; *

This class has two main purposes: * generating PQG parameters and verifying PQG parameters. To generate * PQG parameters, call one of the static generate methods. - * They will return a new set of PQG paramters. To verify existing PQG + * They will return a new set of PQG parameters. To verify existing PQG * parameters, create a new PQGParams object with the * constructor and call paramsAreValid on the object. * diff --git a/mozilla/security/jss/org/mozilla/jss/crypto/Signature.java b/mozilla/security/jss/org/mozilla/jss/crypto/Signature.java index de196c79522..4113aac6619 100644 --- a/mozilla/security/jss/org/mozilla/jss/crypto/Signature.java +++ b/mozilla/security/jss/org/mozilla/jss/crypto/Signature.java @@ -188,7 +188,7 @@ public class Signature { * @param off The beginning offset of the bytes to be signed/verified. * @param len The number of bytes to be signed/verified. * @exception SignatureException If an error occurs in the - * signature/verifcation. + * signature/verification. * @exception TokenException If an error occurs on the token. */ public void update(byte[] data, int off, int len) diff --git a/mozilla/security/jss/org/mozilla/jss/crypto/TokenSupplierManager.java b/mozilla/security/jss/org/mozilla/jss/crypto/TokenSupplierManager.java index d25d07966fb..289ea69e415 100644 --- a/mozilla/security/jss/org/mozilla/jss/crypto/TokenSupplierManager.java +++ b/mozilla/security/jss/org/mozilla/jss/crypto/TokenSupplierManager.java @@ -37,7 +37,7 @@ package org.mozilla.jss.crypto; /** * The org.mozilla.jss.provider package comes before CryptoManager in - * the depency list, so this class is used to allow them to access + * the dependency list, so this class is used to allow them to access * CryptoManager sneakily. When CryptoManager initializes, it registers * itself as a token supplier with setTokenSupplier. Then * the providers call getTokenSupplier when they need to use diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs10/CertificationRequest.java b/mozilla/security/jss/org/mozilla/jss/pkcs10/CertificationRequest.java index 30b50986e03..9574f1bdcc5 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs10/CertificationRequest.java +++ b/mozilla/security/jss/org/mozilla/jss/pkcs10/CertificationRequest.java @@ -90,7 +90,7 @@ public class CertificationRequest implements ASN1Value { * @param info A CertificationRequestInfo (TBSCertificationRequest), * which specifies * the actual information of the CertificationRequest. - * @param privKey The private key with which to sign the certificat. + * @param privKey The private key with which to sign the certificate. * @param signingAlg The algorithm to use to sign the CertificationRequest. * It must match the algorithm specified in the CertificationRequestInfo. * @exception IOException If an error occurred while encoding the diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/KeyType.java b/mozilla/security/jss/org/mozilla/jss/pkcs11/KeyType.java index 03edc3df3eb..9c4e07e6e58 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs11/KeyType.java +++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/KeyType.java @@ -235,7 +235,7 @@ public final class KeyType { EncryptionAlgorithm.AES_256_ECB, EncryptionAlgorithm.AES_256_CBC, /* AES CBC PAD is the same as AES_256_CBC_PAD */ - /* shouldn't break backward compatiblity 313798*/ + /* shouldn't break backward compatibility 313798*/ //EncryptionAlgorithm.AES_CBC_PAD, EncryptionAlgorithm.AES_128_CBC_PAD, EncryptionAlgorithm.AES_192_CBC_PAD, diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c index 1a6eafec278..9285bf1c8ea 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c +++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c @@ -296,7 +296,7 @@ JSS_PK11_getCipherContext(JNIEnv *env, jobject proxy, PK11Context **pContext) * Wraps a PK11Context in a CipherContextProxy. * * context - * address of a poitner to a PK11Context, which must not be NULL. + * address of a pointer to a PK11Context, which must not be NULL. * It will be eaten by the wrapper and set to NULL, even if the * function returns NULL. * diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java index a9209640565..3097fa83a82 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java +++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java @@ -443,7 +443,7 @@ final class PK11KeyWrapper implements KeyWrapper { extractPublicValue(PublicKey publicKey, PrivateKey.Type type) throws InvalidKeyException { - /* this code should call a generic function wich returns the + /* this code should call a generic function which returns the * proper public value. */ if( publicKey == null ) { throw new InvalidKeyException("publicKey is null"); diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.java b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.java index 473280d529f..0ff6ee0fc5c 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.java +++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.java @@ -124,7 +124,7 @@ public final class PK11MessageDigest extends JSSMessageDigest { public void reset() throws DigestException { if( ! (alg instanceof HMACAlgorithm) ) { // This is a regular digest, so we have enough information - // to inialize the context + // to initialize the context this.digestProxy = initDigest(alg); } else if( hmacKey != null ) { // This is an HMAC digest, and we have a key diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c index 269db82176b..8ecfdf8380a 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c +++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PubKey.c @@ -432,7 +432,7 @@ Java_org_mozilla_jss_pkcs11_PK11ECPublicKey_getCurveByteArray * * Returns the public value (W) of this EC Public Key. * The format is a 1 byte to indicate compression followed by points - * Wx and Wy unsigned and connatonatted. + * Wx and Wy unsigned and concatenated. * */ JNIEXPORT jbyteArray JNICALL diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Store.c b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Store.c index b4065f45871..d06b6f94522 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Store.c +++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Store.c @@ -77,7 +77,7 @@ Java_org_mozilla_jss_pkcs11_PK11Store_putKeysInVector /* * Most, if not all, tokens have to be logged in before they allow - * access to their private keys, so try to login here. If we're already + * access to their private keys, so try to log in here. If we're already * logged in, this is a no-op. * If the login fails, go ahead and try to get the keys anyway, in case * this is an exceptionally promiscuous token. diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.java b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.java index 02c97edaae3..a783d98dcde 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.java +++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Token.java @@ -48,7 +48,7 @@ import java.security.InvalidParameterException; * CryptoManager class. * * @author nicolson - * @version $Revision: 1.11 $ $Date: 2007-11-10 00:37:57 $ + * @version $Revision: 1.12 $ $Date: 2009-07-14 22:31:02 $ * @see org.mozilla.jss.CryptoManager */ public final class PK11Token implements CryptoToken { @@ -581,7 +581,7 @@ public final class PK11Token implements CryptoToken { } /** - * This class just hardwires the type to be TOKEN so we don't have to mess + * This class just hard-wires the type to be TOKEN so we don't have to mess * with Java constants in native code. */ class TokenCallbackInfo extends PasswordCallbackInfo { diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/pk11util.h b/mozilla/security/jss/org/mozilla/jss/pkcs11/pk11util.h index a954e06442b..17b9be70b06 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs11/pk11util.h +++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/pk11util.h @@ -470,7 +470,7 @@ JSS_PK11_getCipherContext(JNIEnv *env, jobject proxy, PK11Context **pContext); * Wraps a PK11Context in a CipherContextProxy. * * context - * address of a poitner to a PK11Context, which must not be NULL. + * address of a pointer to a PK11Context, which must not be NULL. * It will be eaten by the wrapper and set to NULL, even if the * function returns NULL. * @@ -516,7 +516,7 @@ JSS_PK11_getNewSession(PK11SlotInfo *slot, PRBool *owner); * The slot on which this session lives. * * session - * The sessin to close. + * The session to close. * * owner * As returned by JSS_PK11_GetNewSession. PR_TRUE if the session was diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs7/Attribute.java b/mozilla/security/jss/org/mozilla/jss/pkcs7/Attribute.java index b74fc53c8bb..2179b2608f3 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs7/Attribute.java +++ b/mozilla/security/jss/org/mozilla/jss/pkcs7/Attribute.java @@ -79,7 +79,7 @@ public class Attribute implements ASN1Value { /** * If this AVA was constructed, returns the SET of ASN1Values passed to the - * constructor. If this Atrribute was decoded with an Attribute.Template, + * constructor. If this Attribute was decoded with an Attribute.Template, * returns a SET of ANYs. */ public SET getValues() { diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs7/SignedData.java b/mozilla/security/jss/org/mozilla/jss/pkcs7/SignedData.java index 027603a0873..f811c14d437 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs7/SignedData.java +++ b/mozilla/security/jss/org/mozilla/jss/pkcs7/SignedData.java @@ -227,7 +227,7 @@ public class SignedData implements ASN1Value { */ /** - * Create a SignedData ASN1 object. Both certificates and crls + * Create a SignedData ASN1 object. Both certificates and CRLs * are optional. If you pass in a null for either value, that * parameter will not get written in the sequence. * @@ -259,7 +259,7 @@ public class SignedData implements ASN1Value { * omitted. * @param crls A SET of ASN1Values, which should encode to the ASN1 type * CertificateRevocationList. This implementation does - * not interpret crls. If this parameter is null, + * not interpret CRLs. If this parameter is null, * the crls field will be omitted. * @param signerInfos SignerInfo structures containing signatures * of the content. Additional signerInfos can be added with diff --git a/mozilla/security/jss/org/mozilla/jss/pkix/cert/Certificate.java b/mozilla/security/jss/org/mozilla/jss/pkix/cert/Certificate.java index f0a128e3fc2..570363603f7 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkix/cert/Certificate.java +++ b/mozilla/security/jss/org/mozilla/jss/pkix/cert/Certificate.java @@ -89,7 +89,7 @@ public class Certificate implements ASN1Value * Creates and signs an X.509 Certificate. * @param info A CertificateInfo (TBSCertificate), which specifies * the actual information of the certificate. - * @param privKey The private key with which to sign the certificat. + * @param privKey The private key with which to sign the certificate. * @param signingAlg The algorithm to use to sign the certificate. * It must match the algorithm specified in the CertificateInfo. * @exception IOException If an error occurred while encoding the diff --git a/mozilla/security/jss/org/mozilla/jss/pkix/cert/SubjectKeyIdentifier.java b/mozilla/security/jss/org/mozilla/jss/pkix/cert/SubjectKeyIdentifier.java index 1d166020426..76a4fa66287 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkix/cert/SubjectKeyIdentifier.java +++ b/mozilla/security/jss/org/mozilla/jss/pkix/cert/SubjectKeyIdentifier.java @@ -49,7 +49,7 @@ import org.mozilla.jss.util.Assert; * public key used in an application. This extension by default is marked * non-critical. * - *

Extensions are addiitonal attributes which can be inserted in a X509 + *

Extensions are additional attributes which can be inserted in a X509 * v3 certificate. For example a "Driving License Certificate" could have * the driving license number as a extension. * diff --git a/mozilla/security/jss/org/mozilla/jss/pkix/cmc/TaggedAttribute.java b/mozilla/security/jss/org/mozilla/jss/pkix/cmc/TaggedAttribute.java index 9998143aee0..4d826717ce4 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkix/cmc/TaggedAttribute.java +++ b/mozilla/security/jss/org/mozilla/jss/pkix/cmc/TaggedAttribute.java @@ -110,7 +110,7 @@ public class TaggedAttribute implements ASN1Value { /** * If this AVA was constructed, returns the SET of ASN1Values passed to the - * constructor. If this Atrribute was decoded with an Attribute.Template, + * constructor. If this Attribute was decoded with an Attribute.Template, * returns a SET of ANYs. */ public SET getValues() { diff --git a/mozilla/security/jss/org/mozilla/jss/pkix/cms/SignedData.java b/mozilla/security/jss/org/mozilla/jss/pkix/cms/SignedData.java index d129fa2ca8d..4d19c63b671 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkix/cms/SignedData.java +++ b/mozilla/security/jss/org/mozilla/jss/pkix/cms/SignedData.java @@ -226,7 +226,7 @@ public class SignedData implements ASN1Value { */ /** - * Create a SignedData ASN1 object. Both certificates and crls + * Create a SignedData ASN1 object. Both certificates and CRLs * are optional. If you pass in a null for either value, that * parameter will not get written in the sequence. * @@ -258,7 +258,7 @@ public class SignedData implements ASN1Value { * omitted. * @param crls A SET of ASN1Values, which should encode to the ASN1 type * CertificateRevocationList. This implementation does - * not interpret crls. If this parameter is null, + * not interpret CRLs. If this parameter is null, * the crls field will be omitted. * @param signerInfos SignerInfo structures containing signatures * of the content. Additional signerInfos can be added with diff --git a/mozilla/security/jss/org/mozilla/jss/pkix/cms/SignerInfo.java b/mozilla/security/jss/org/mozilla/jss/pkix/cms/SignerInfo.java index ff34a554e4d..503101266cc 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkix/cms/SignerInfo.java +++ b/mozilla/security/jss/org/mozilla/jss/pkix/cms/SignerInfo.java @@ -451,7 +451,7 @@ public class SignerInfo implements ASN1Value { Assert._assert( signerIdentifier.getType().equals(SignerIdentifier.SUBJECT_KEY_IDENTIFIER) ); - // xxxxx Do we have method to get key using keyIdentifier + // XXX Do we have method to get key using keyIdentifier } } diff --git a/mozilla/security/jss/org/mozilla/jss/pkix/primitive/AlgorithmIdentifier.java b/mozilla/security/jss/org/mozilla/jss/pkix/primitive/AlgorithmIdentifier.java index aef833aa5b8..63ddfb0d80c 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkix/primitive/AlgorithmIdentifier.java +++ b/mozilla/security/jss/org/mozilla/jss/pkix/primitive/AlgorithmIdentifier.java @@ -83,7 +83,7 @@ public class AlgorithmIdentifier implements ASN1Value { /** * If this instance was constructed, returns the - * parameter passed in to the constructer. If this instance was + * parameter passed in to the constructor. If this instance was * decoded from a template, returns an ANY that was read from the * BER stream. In either case, it will return null if no parameters * were supplied. diff --git a/mozilla/security/jss/org/mozilla/jss/pkix/primitive/Attribute.java b/mozilla/security/jss/org/mozilla/jss/pkix/primitive/Attribute.java index 525e413b120..ecc2cb21071 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkix/primitive/Attribute.java +++ b/mozilla/security/jss/org/mozilla/jss/pkix/primitive/Attribute.java @@ -79,7 +79,7 @@ public class Attribute implements ASN1Value { /** * If this AVA was constructed, returns the SET of ASN1Values passed to the - * constructor. If this Atrribute was decoded with an Attribute.Template, + * constructor. If this Attribute was decoded with an Attribute.Template, * returns a SET of ANYs. */ public SET getValues() { diff --git a/mozilla/security/jss/org/mozilla/jss/pkix/primitive/DirectoryString.java b/mozilla/security/jss/org/mozilla/jss/pkix/primitive/DirectoryString.java index b9d5c746dd2..55edeb53764 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkix/primitive/DirectoryString.java +++ b/mozilla/security/jss/org/mozilla/jss/pkix/primitive/DirectoryString.java @@ -174,7 +174,7 @@ public class DirectoryString implements ASN1Value { } /** - * @param implicitTag This paramter is ignored, because + * @param implicitTag This parameter is ignored, because * DirectoryStrings (being CHOICEs) cannot have implicit tags. */ public ASN1Value decode(Tag implicitTag, InputStream istream) diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/SSLClient.java b/mozilla/security/jss/org/mozilla/jss/ssl/SSLClient.java index 5d11002fc0d..ac031ec4ff8 100644 --- a/mozilla/security/jss/org/mozilla/jss/ssl/SSLClient.java +++ b/mozilla/security/jss/org/mozilla/jss/ssl/SSLClient.java @@ -147,7 +147,7 @@ public class SSLClient results.println(htmlHeader); results.println("SSL Client Tester"); results.println( - "$Id: SSLClient.java,v 1.7 2004-04-25 15:02:28 gerv%gerv.net Exp $ " + + "$Id: SSLClient.java,v 1.8 2009-07-14 22:31:14 glen.beasley%sun.com Exp $ " + versionStr ); SSLSocket s; @@ -213,7 +213,7 @@ public class SSLClient //s.setClientCertNickname("JavaSSLTestClientCert"); - // Setup a hanshake callback. This listener will get invoked + // Setup a handshake callback. This listener will get invoked // When the SSL handshake is completed on this socket. listener = new ClientHandshakeCB(this); diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java b/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java index 90e8243f33b..c0ea9aa1b67 100644 --- a/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java +++ b/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java @@ -173,7 +173,7 @@ public class SSLServerSocket extends java.net.ServerSocket { * @return java.net.Socket Local socket for client communication * * @throws IOException If an input or output exception occurred - * @throws SocketTimeoutException If the socket timesout trying to connect + * @throws SocketTimeoutException If the socket times out trying to connect * @throws InterruptedIOException If an input or output is interrupted * @throws SSLSocketException JSS subclass of java.net.SocketException */ diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java b/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java index 93000b87a3b..99650000b48 100644 --- a/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java +++ b/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java @@ -449,7 +449,7 @@ public class SSLSocket extends java.net.Socket { return; } /* - * If a read or write is occuring, abort the I/O. Any + * If a read or write is occurring, abort the I/O. Any * further attempts to read/write will fail since isClosed * is true */ diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java b/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java index 20ff4d263cc..e1a1958cd1e 100644 --- a/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java +++ b/mozilla/security/jss/org/mozilla/jss/ssl/SocketBase.java @@ -193,7 +193,7 @@ class SocketBase { /** * Sets the SSL option setting mode value use for options - * that have more values than just enable/diasable. + * that have more values than just enable/disable. */ native void setSSLOptionMode(int option, int option2) throws SocketException; diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/callbacks.c b/mozilla/security/jss/org/mozilla/jss/ssl/callbacks.c index 930011dbdbc..9a8f01af84d 100644 --- a/mozilla/security/jss/org/mozilla/jss/ssl/callbacks.c +++ b/mozilla/security/jss/org/mozilla/jss/ssl/callbacks.c @@ -74,7 +74,7 @@ secCmpCertChainWCANames(CERTCertificate *cert, CERTDistNames *caNames) /* compute an alternate issuer name for compatibility with 2.0 * enterprise server, which send the CA names without - * the outer layer of DER hearder + * the outer layer of DER header */ rv = DER_Lengths(&issuerName, &headerlen, &contentlen); if ( rv == SECSuccess ) { diff --git a/mozilla/security/jss/org/mozilla/jss/tests/Constants.java b/mozilla/security/jss/org/mozilla/jss/tests/Constants.java index 0538b13914b..249538ee129 100755 --- a/mozilla/security/jss/org/mozilla/jss/tests/Constants.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/Constants.java @@ -56,7 +56,7 @@ public interface Constants { } /* - * returns the string represantation of the ciphersuite OR + * returns the string representation of the ciphersuite OR * returns null if the ciphersuite is not found */ public static final String cipherToString(int aCipher ) { diff --git a/mozilla/security/jss/org/mozilla/jss/tests/DigestTest.java b/mozilla/security/jss/org/mozilla/jss/tests/DigestTest.java index ac795614164..1e7892e400e 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/DigestTest.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/DigestTest.java @@ -51,7 +51,7 @@ public class DigestTest { static final String MOZ_PROVIDER_NAME = "Mozilla-JSS"; /** - * List all the Digest Algorithms that JSS implenents. + * List all the Digest Algorithms that JSS implements. */ static final String JSS_Digest_Algs[] = { "MD2", "MD5", "SHA-1", "SHA-256", "SHA-384","SHA-512"}; @@ -149,7 +149,7 @@ public class DigestTest { System.out.println("The Java version is: " + javaVersion); for (int i = 0; i < JSS_Digest_Algs.length; i++) { - // compare Mozilla-JSS implemenation with all providers + // compare Mozilla-JSS implementation with all providers // that also support the given algorithm if (messageDigestCompare(JSS_Digest_Algs[i], toBeDigested) == false) { diff --git a/mozilla/security/jss/org/mozilla/jss/tests/HMACTest.java b/mozilla/security/jss/org/mozilla/jss/tests/HMACTest.java index 53a45ec5f5a..1c3c5e69b64 100755 --- a/mozilla/security/jss/org/mozilla/jss/tests/HMACTest.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/HMACTest.java @@ -199,7 +199,7 @@ public class HMACTest { hmacTest.doHMAC(JSS_HMAC_Algs[i], sk, clearText); } } else { - // compare MOZ_PROVIDER_NAME implemenation with all + // compare MOZ_PROVIDER_NAME implementation with all // providers that also support the given algorithm if (!hmacTest.compareHMAC( JSS_HMAC_Algs[i], sk, clearText)) { diff --git a/mozilla/security/jss/org/mozilla/jss/tests/JCAKeyWrap.java b/mozilla/security/jss/org/mozilla/jss/tests/JCAKeyWrap.java index 49fe0eb0952..7115566ee75 100755 --- a/mozilla/security/jss/org/mozilla/jss/tests/JCAKeyWrap.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/JCAKeyWrap.java @@ -401,7 +401,7 @@ public class JCAKeyWrap { } } else if (!keysEqual(keyA, keyB)) { throw new Exception("unwrapped key " + - "does not match orginal"); + "does not match original"); } //As an extra test encrypt with keyA using ProviderA @@ -474,7 +474,7 @@ public class JCAKeyWrap { ((SecretKeyFacade) symKey).key.getStrength() + " with " + wrapperKey.getAlgorithm() + " " + ((SecretKeyFacade) wrapperKey).key.getStrength() + - " symetric key. "); + " symmetric key. "); // wrap key Cipher cipher = Cipher.getInstance(wrapperAlg, providerA); diff --git a/mozilla/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java b/mozilla/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java index fd0b92f9683..effd215a043 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/JCASymKeyGen.java @@ -375,7 +375,7 @@ public class JCASymKeyGen { int rLen = cipher.update(ciphertext, 0, cLen, recovered, 0); rLen += cipher.doFinal(recovered, rLen); - //ensure the recovered bytes equals the orginal plaintext + //ensure the recovered bytes equals the original plaintext boolean isEqual = true; for (int i = 0; i < plaintext.length; i++) { if (i 3) - System.out.println("DBEUG: JSSE_SSLClient.java java.vendor=" + + System.out.println("DEBUG: JSSE_SSLClient.java java.vendor=" + javaVendor); // Initialize the system @@ -320,7 +320,7 @@ public class JSSE_SSLClient { } kmf.init(ks, passphrase); - // trust manager that trusts all cetificates + // trust manager that trusts all certificates TrustManager[] trustAllCerts = new TrustManager[]{ new X509TrustManager() { public boolean checkClientTrusted( diff --git a/mozilla/security/jss/org/mozilla/jss/tests/JSS_FileUploadClient.java b/mozilla/security/jss/org/mozilla/jss/tests/JSS_FileUploadClient.java index 09cc91d9526..7d186773246 100755 --- a/mozilla/security/jss/org/mozilla/jss/tests/JSS_FileUploadClient.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/JSS_FileUploadClient.java @@ -165,7 +165,7 @@ public class JSS_FileUploadClient { } /** - * Set EOF for closinng server socket + * Set EOF for closing server socket * @param null for closing server socket */ public void setEOF(String fEof) { @@ -295,7 +295,7 @@ public class JSS_FileUploadClient { } /** - * SSL Handshake Listeren implementation. + * SSL Handshake Listener implementation. */ public class HandshakeListener implements SSLHandshakeCompletedListener { diff --git a/mozilla/security/jss/org/mozilla/jss/tests/JSS_SelfServClient.java b/mozilla/security/jss/org/mozilla/jss/tests/JSS_SelfServClient.java index 5148d9c04e1..7b3ab48c6f6 100755 --- a/mozilla/security/jss/org/mozilla/jss/tests/JSS_SelfServClient.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/JSS_SelfServClient.java @@ -228,7 +228,7 @@ public class JSS_SelfServClient implements ConstantsBase, Constants { System.out.print(ciphersuite); } if (server.equalsIgnoreCase("JSS")) { - //For JSS SSLServer don'te test + //For JSS SSLServer don't test if ((ciphersuite.indexOf("_DHE_") != -1) || (ciphersuite.indexOf("SSL2") != -1) || @@ -674,7 +674,7 @@ public class JSS_SelfServClient implements ConstantsBase, Constants { "threads to die. Exiting the program"); System.out.println("Time taken: " + (System.currentTimeMillis() - start) + - " Millieseconds"); + " Milliseconds"); /* while all the threads have not completed cleanup. */ /* the functional test of each configured cihpersuite */ /* successfully established a connection. */ @@ -874,7 +874,7 @@ public class JSS_SelfServClient implements ConstantsBase, Constants { } /** - * SSL Handshake Listeren implementation. + * SSL Handshake Listener implementation. */ public class HandshakeListener implements SSLHandshakeCompletedListener { diff --git a/mozilla/security/jss/org/mozilla/jss/tests/JSS_SelfServServer.java b/mozilla/security/jss/org/mozilla/jss/tests/JSS_SelfServServer.java index 708bd36f8a6..48482bfa150 100755 --- a/mozilla/security/jss/org/mozilla/jss/tests/JSS_SelfServServer.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/JSS_SelfServServer.java @@ -176,7 +176,7 @@ public class JSS_SelfServServer { /* Disable SSL2 and SSL3 ciphers */ SSLSocket.enableSSL2Default(false); SSLSocket.enableSSL3Default(false); - //Enable ony FIPS ciphersuites. + //Enable only FIPS ciphersuites. int ciphers[] = org.mozilla.jss.ssl.SSLSocket.getImplementedCipherSuites(); for (int i = 0; i < ciphers.length; ++i) { @@ -190,7 +190,7 @@ public class JSS_SelfServServer { } } } else { - /* turn on all implemented ciphersuites the server ceriticate + /* turn on all implemented ciphersuites the server certificate * will determine if the ciphersuites can be used. */ int ciphers[] = diff --git a/mozilla/security/jss/org/mozilla/jss/tests/ListCerts.java b/mozilla/security/jss/org/mozilla/jss/tests/ListCerts.java index 7f7e69871d3..85d66593b00 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/ListCerts.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/ListCerts.java @@ -93,7 +93,7 @@ public class ListCerts { } } System.out.println("Convert to JDK cert"); - //Convert to JDK certicate + //Convert to JDK certificate CertificateFactory cf = CertificateFactory.getInstance("X.509"); ByteArrayInputStream bais = new ByteArrayInputStream( certs[i].getEncoded()); diff --git a/mozilla/security/jss/org/mozilla/jss/tests/SSLClientAuth.java b/mozilla/security/jss/org/mozilla/jss/tests/SSLClientAuth.java index 53112333091..5b002a6b816 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/SSLClientAuth.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/SSLClientAuth.java @@ -281,7 +281,7 @@ public class SSLClientAuth implements Runnable { /* if FIPS is enabled, configure only FIPS ciphersuites */ if (cm.FIPSEnabled()) { - System.out.println("The NSS database is confirued in FIPS" + + System.out.println("The NSS database is configured in FIPS" + "mode."); System.out.println("Enable ony FIPS ciphersuites."); int ciphers[] = diff --git a/mozilla/security/jss/org/mozilla/jss/tests/SymKeyGen.java b/mozilla/security/jss/org/mozilla/jss/tests/SymKeyGen.java index af052fd3a1e..ccb8fd955bf 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/SymKeyGen.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/SymKeyGen.java @@ -106,7 +106,7 @@ public class SymKeyGen { try { //this is debug code you don't initialize //PBE algs with key Strength doing this should throw - //InvaldAlgortithmParameterException + //InvalidAlgorithmParameterException kg.initialize(keyStrength); throw new Exception("ERROR: Initializing PBE key with strength "+ keyStrength + " succeeded"); diff --git a/mozilla/security/jss/org/mozilla/jss/tests/all.pl b/mozilla/security/jss/org/mozilla/jss/tests/all.pl index b75ebb10121..6f86201254f 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/all.pl +++ b/mozilla/security/jss/org/mozilla/jss/tests/all.pl @@ -398,7 +398,7 @@ sub run_ssl_test { return; } sleep 5; - print "\nSSL Server is envoked using port $serverPort \n" ; + print "\nSSL Server is invoked using port $serverPort \n" ; print "$clientCommand \n"; $result = system("$clientCommand"); $result >>=8; @@ -450,7 +450,7 @@ if( ! -d $testdir ) { ("$testdir/cert8.db", "$testdir/key3.db", "$testdir/secmod.db", "$testdir/rsa.pfx"); (grep{ -f } @dbfiles) and die "There is already an old database in $testdir"; my $result = system("cp $nss_lib_dir/*nssckbi* $testdir"); $result >>= 8; - $result and die "Failed to copy builtins library"; + $result and die "Failed to copy built-ins library"; } print "creating pkcs11config file\n"; diff --git a/mozilla/security/jss/org/mozilla/jss/util/Assert.java b/mozilla/security/jss/org/mozilla/jss/util/Assert.java index 9615b16f5b0..c32c640a76f 100644 --- a/mozilla/security/jss/org/mozilla/jss/util/Assert.java +++ b/mozilla/security/jss/org/mozilla/jss/util/Assert.java @@ -44,7 +44,7 @@ import org.mozilla.jss.util.*; * * @see org.mozilla.jss.util.Debug * @see org.mozilla.jss.util.AssertionException - * @version $Revision: 1.5 $ $Date: 2004-04-25 15:02:29 $ + * @version $Revision: 1.6 $ $Date: 2009-07-14 22:31:16 $ */ public class Assert { /** @@ -94,7 +94,7 @@ public class Assert { } /** - * Throw an AssertionException because functionlity is not yet implemented. + * Throw an AssertionException because functionality is not yet implemented. * * @param msg A message describing what is not implemented. */ diff --git a/mozilla/security/jss/org/mozilla/jss/util/SSLerrs.h b/mozilla/security/jss/org/mozilla/jss/util/SSLerrs.h index 8f98c1a94ad..376ee83992d 100644 --- a/mozilla/security/jss/org/mozilla/jss/util/SSLerrs.h +++ b/mozilla/security/jss/org/mozilla/jss/util/SSLerrs.h @@ -238,7 +238,7 @@ ER3(SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT , (SSL_ERROR_BASE + 59), "SSL peer was not expecting a handshake message it received.") ER3(SSL_ERROR_DECOMPRESSION_FAILURE_ALERT , (SSL_ERROR_BASE + 60), -"SSL peer was unable to succesfully decompress an SSL record it received.") +"SSL peer was unable to successfully decompress an SSL record it received.") ER3(SSL_ERROR_HANDSHAKE_FAILURE_ALERT , (SSL_ERROR_BASE + 61), "SSL peer was unable to negotiate an acceptable set of security parameters.") diff --git a/mozilla/security/jss/org/mozilla/jss/util/errstrings.c b/mozilla/security/jss/org/mozilla/jss/util/errstrings.c index 58da1e0b025..33bd4fdd57b 100644 --- a/mozilla/security/jss/org/mozilla/jss/util/errstrings.c +++ b/mozilla/security/jss/org/mozilla/jss/util/errstrings.c @@ -50,7 +50,7 @@ typedef struct tuple_str tuple_str; static const tuple_str errStrings[] = { -/* keep this list in asceding order of error numbers */ +/* keep this list in ascending order of error numbers */ #include "SSLerrs.h" #include "SECerrs.h" #include "NSPRerrs.h"