500138 fix typos patch from timeless
git-svn-id: svn://10.0.0.236/trunk@257700 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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 <b>This parameter is ignored.</b> 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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -46,7 +46,7 @@ import org.mozilla.jss.util.Assert;
|
||||
* <p>This class has two main purposes:
|
||||
* generating PQG parameters and verifying PQG parameters. To generate
|
||||
* PQG parameters, call one of the static <code>generate</code> 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 <code>PQGParams</code> object with the
|
||||
* constructor and call <code>paramsAreValid</code> on the object.
|
||||
*
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 <code>setTokenSupplier</code>. Then
|
||||
* the providers call <code>getTokenSupplier</code> when they need to use
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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.
|
||||
*
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
* <i>CertificateRevocationList</i>. This implementation does
|
||||
* not interpret crls. If this parameter is <code>null</code>,
|
||||
* not interpret CRLs. If this parameter is <code>null</code>,
|
||||
* the <code>crls</code> field will be omitted.
|
||||
* @param signerInfos <i>SignerInfo</i> structures containing signatures
|
||||
* of the content. Additional signerInfos can be added with
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -49,7 +49,7 @@ import org.mozilla.jss.util.Assert;
|
||||
* public key used in an application. This extension by default is marked
|
||||
* non-critical.
|
||||
*
|
||||
* <p>Extensions are addiitonal attributes which can be inserted in a X509
|
||||
* <p>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.
|
||||
*
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
* <i>CertificateRevocationList</i>. This implementation does
|
||||
* not interpret crls. If this parameter is <code>null</code>,
|
||||
* not interpret CRLs. If this parameter is <code>null</code>,
|
||||
* the <code>crls</code> field will be omitted.
|
||||
* @param signerInfos <i>SignerInfo</i> structures containing signatures
|
||||
* of the content. Additional signerInfos can be added with
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -174,7 +174,7 @@ public class DirectoryString implements ASN1Value {
|
||||
}
|
||||
|
||||
/**
|
||||
* @param implicitTag <b>This paramter is ignored</b>, because
|
||||
* @param implicitTag <b>This parameter is ignored</b>, because
|
||||
* DirectoryStrings (being CHOICEs) cannot have implicit tags.
|
||||
*/
|
||||
public ASN1Value decode(Tag implicitTag, InputStream istream)
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 ) {
|
||||
|
||||
@@ -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 ) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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<plaintext.length) {
|
||||
@@ -420,7 +420,7 @@ public class JCASymKeyGen {
|
||||
String certDbLoc = ".";
|
||||
String passwdFile = null;
|
||||
// Mozilla supported symmetric key ciphers and algorithms
|
||||
// Note JCE supports algorthm/ECB/PKCS5Padding and JSS does
|
||||
// Note JCE supports algorithm/ECB/PKCS5Padding and JSS does
|
||||
// not support algorithms in ECB mode with PKCS5Padding
|
||||
String [][] symKeyTable = {
|
||||
{"DES", "DES/ECB/NoPadding", "DES/CBC/PKCS5Padding",
|
||||
@@ -492,7 +492,7 @@ public class JCASymKeyGen {
|
||||
System.out.println("unable to generate key: " +
|
||||
symKeyTable[i][0] + " " + e.getMessage());
|
||||
}
|
||||
//test the cihper algorithms for this keyType
|
||||
//test the cipher algorithms for this keyType
|
||||
for (int a = 1 ; a < symKeyTable[i].length; a++){
|
||||
//encrypt/decrypt with Mozilla Provider
|
||||
|
||||
|
||||
@@ -275,7 +275,7 @@ public class JSSE_SSLClient {
|
||||
|
||||
String javaVendor = System.getProperty("java.vendor");
|
||||
if (Constants.debug_level > 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(
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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[] =
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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[] =
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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.
|
||||
*/
|
||||
|
||||
@@ -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.")
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user