Removed whitespaces from Java code.

Whitespaces in Java code have been removed with the following command:

  find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \;

Ticket #134

9 files changed, 153 insertions, 153 deletions

diff --git a/base/util/src/netscape/security/pkcs/ContentInfo.java b/base/util/src/netscape/security/pkcs/ContentInfo.java
index 9825494c2..d6a4db7c6 100644
--- a/base/util/src/netscape/security/pkcs/ContentInfo.java
+++ b/base/util/src/netscape/security/pkcs/ContentInfo.java
@@ -26,7 +26,7 @@ import netscape.security.util.ObjectIdentifier;
 
 /**
  * A ContentInfo type, as defined in PKCS#7.
- * 
+ *
  * @version 1.12
  * @author Benjamin Renaud
  */
diff --git a/base/util/src/netscape/security/pkcs/PKCS10.java b/base/util/src/netscape/security/pkcs/PKCS10.java
index a6ddd203f..2d1c8eadb 100644
--- a/base/util/src/netscape/security/pkcs/PKCS10.java
+++ b/base/util/src/netscape/security/pkcs/PKCS10.java
@@ -43,28 +43,28 @@ import netscape.security.x509.X509Key;
  * the entity which created the certificate request. These cert requests
  * basically consist of the subject's X.500 name and public key, signed
  * using the corresponding private key.
- * 
+ *
  * The ASN.1 syntax for a Certification Request is:
- * 
+ *
  * <pre>
  * CertificationRequest ::= SEQUENCE {
  *    certificationRequestInfo CertificationRequestInfo,
  *    signatureAlgorithm       SignatureAlgorithmIdentifier,
  *    signature                Signature
  *  }
- * 
+ *
  * SignatureAlgorithmIdentifier ::= AlgorithmIdentifier
  * Signature ::= BIT STRING
- * 
+ *
  * CertificationRequestInfo ::= SEQUENCE {
  *    version                 Version,
  *    subject                 Name,
  *    subjectPublicKeyInfo    SubjectPublicKeyInfo,
  *    attributes [0] IMPLICIT Attributes
- * }    
+ * }
  * Attributes ::= SET OF Attribute
  * </pre>
- * 
+ *
  * @author David Brownell
  * @author Amit Kapoor
  * @author Hemma Prafullchandra
@@ -75,7 +75,7 @@ public class PKCS10 {
      * Constructs an unsigned PKCS #10 certificate request. Before this
      * request may be used, it must be encoded and signed. Then it
      * must be retrieved in some conventional format (e.g. string).
-     * 
+     *
      * @param publicKey the public key that should be placed
      *            into the certificate generated by the CA.
      */
@@ -88,7 +88,7 @@ public class PKCS10 {
      * Constructs an unsigned PKCS #10 certificate request. Before this
      * request may be used, it must be encoded and signed. Then it
      * must be retrieved in some conventional format (e.g. string).
-     * 
+     *
      * @param publicKey the public key that should be placed
      *            into the certificate generated by the CA.
      * @param attributes additonal set of PKCS10 attributes requested
@@ -107,7 +107,7 @@ public class PKCS10 {
      * the request's signature as it does so. This constructor would
      * typically be used by a Certificate Authority, from which a new
      * certificate would then be constructed.
-     * 
+     *
      * @param data the DER-encoded PKCS #10 request.
      * @param sigver boolean specifies signature verification enabled or not
      * @exception IOException for low level errors reading the data
@@ -207,7 +207,7 @@ public class PKCS10 {
     /**
      * Create the signed certificate request. This will later be
      * retrieved in either string or binary format.
-     * 
+     *
      * @param requester identifies the signer (by X.500 name)
      *            and provides the private key used to sign.
      * @exception IOException on errors.
@@ -284,7 +284,7 @@ public class PKCS10 {
     /**
      * Returns the encoded and signed certificate request as a
      * DER-encoded byte array.
-     * 
+     *
      * @return the certificate request, or null if encodeAndSign()
      *         has not yet been called.
      */
@@ -299,7 +299,7 @@ public class PKCS10 {
      * used this for some time. Some certificate authorities expect some
      * more information, in particular contact information for the web
      * server administrator.
-     * 
+     *
      * @param out the print stream where the certificate request
      *            will be printed.
      * @exception IOException when an output operation failed
diff --git a/base/util/src/netscape/security/pkcs/PKCS10Attribute.java b/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
index a649c395a..eae4b0479 100644
--- a/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
+++ b/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
@@ -37,17 +37,17 @@ import netscape.security.x509.OIDMap;
 
 /**
  * Represent a PKCS Attribute.
- * 
+ *
  * <p>
  * Attributes are addiitonal attributes which can be inserted in a PKCS certificate request. For example a
  * "Driving License Certificate" could have the driving license number as a attribute.
- * 
+ *
  * <p>
  * Attributes are represented as a sequence of the attribute identifier (Object Identifier) and a set of DER encoded
  * attribute values. The current implementation only supports one value per attribute.
- * 
+ *
  * ASN.1 definition of Attribute:
- * 
+ *
  * <pre>
  * Attribute :: SEQUENCE {
  *    type    AttributeValue,
@@ -55,7 +55,7 @@ import netscape.security.x509.OIDMap;
  * }
  * AttributeValue ::= ANY
  * </pre>
- * 
+ *
  * @author Amit Kapoor
  * @author Hemma Prafullchandra
  * @version 1.13
@@ -127,8 +127,8 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
                 Object[] passed = new Object[] { value };
                 attributeValue = cons.newInstance(passed);
             } else {
-                // attribute classes are usable for PKCS10 attributes. 
-                // this is used where the attributes are not actual 
+                // attribute classes are usable for PKCS10 attributes.
+                // this is used where the attributes are not actual
                 // implemented extensions.
                 attributeValue = new ACertAttrSet(inAttrValue);
             }
@@ -142,7 +142,7 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
     /**
      * Constructs an attribute from individual components of ObjectIdentifier
      * and the DER encoded value.
-     * 
+     *
      * @param attributeId the ObjectIdentifier of the attribute.
      * @param attributeValue the CertAttrSet.
      */
@@ -155,7 +155,7 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
     /**
      * Constructs an attribute from another attribute. To be used for
      * creating decoded subclasses.
-     * 
+     *
      * @param attr the attribute to create from.
      */
     public PKCS10Attribute(PKCS10Attribute attr) {
@@ -165,7 +165,7 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
 
     /**
      * Write the output to the DerOutputStream.
-     * 
+     *
      * @param out the OutputStream to write the attribute to.
      * @exception CertificateException on certificate encoding errors.
      * @exception IOException on encoding errors.
@@ -196,10 +196,10 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
     /**
      * DER encode this object onto an output stream.
      * Implements the <code>DerEncoder</code> interface.
-     * 
+     *
      * @param out
      *            the OutputStream on which to write the DER encoding.
-     * 
+     *
      * @exception IOException on encoding errors.
      */
     public void derEncode(OutputStream out) throws IOException {
diff --git a/base/util/src/netscape/security/pkcs/PKCS10Attributes.java b/base/util/src/netscape/security/pkcs/PKCS10Attributes.java
index 8beb1e64c..d9b463b5f 100644
--- a/base/util/src/netscape/security/pkcs/PKCS10Attributes.java
+++ b/base/util/src/netscape/security/pkcs/PKCS10Attributes.java
@@ -30,7 +30,7 @@ import netscape.security.util.DerValue;
 
 /**
  * This class defines the PKCS10 attributes for the request.
- * 
+ *
  * @author Amit Kapoor
  * @author Hemma Prafullchandra
  * @version 1.10
@@ -52,7 +52,7 @@ public class PKCS10Attributes extends Vector<PKCS10Attribute> implements DerEnco
 
     /**
      * Create the object, decoding the values from the passed DER stream.
-     * 
+     *
      * @param in the DerInputStream to read the attributes from.
      * @exception IOException on decoding errors.
      */
@@ -73,9 +73,9 @@ public class PKCS10Attributes extends Vector<PKCS10Attribute> implements DerEnco
 
     /**
      * Encode the attributes in DER form to the stream.
-     * 
+     *
      * @param out the OutputStream to marshal the contents to.
-     * 
+     *
      * @exception IOException on encoding errors.
      */
     public void encode(OutputStream out)
@@ -86,7 +86,7 @@ public class PKCS10Attributes extends Vector<PKCS10Attribute> implements DerEnco
     /**
      * Encode the attributes in DER form to the stream.
      * Implements the <code>DerEncoder</code> interface.
-     * 
+     *
      * @param out the OutputStream to marshal the contents to.
      * @exception IOException on encoding errors.
      */
diff --git a/base/util/src/netscape/security/pkcs/PKCS7.java b/base/util/src/netscape/security/pkcs/PKCS7.java
index c8fb69582..26a0bdb34 100644
--- a/base/util/src/netscape/security/pkcs/PKCS7.java
+++ b/base/util/src/netscape/security/pkcs/PKCS7.java
@@ -43,7 +43,7 @@ import netscape.security.x509.X509CertImpl;
  * type, where to the type of data signed is plain Data.
  * For signedData, <tt>crls</tt>, <tt>attributes</tt> and
  * PKCS#6 Extended Certificates are not supported.
- * 
+ *
  * @version 1.33 97/12/10
  * @author Benjamin Renaud
  */
@@ -61,7 +61,7 @@ public class PKCS7 {
     /**
      * Unmarshals a PKCS7 block from its encoded form, parsing the
      * encoded bytes from the InputStream.
-     * 
+     *
      * @param in an input stream holding at least one PKCS7 block.
      * @exception ParsingException on parsing errors.
      * @exception IOException on other errors.
@@ -93,7 +93,7 @@ public class PKCS7 {
     /**
      * Unmarshals a PKCS7 block from its encoded form, parsing the
      * encoded bytes from the DerInputStream.
-     * 
+     *
      * @param derin a DerInputStream holding at least one PKCS7 block.
      * @exception ParsingException on parsing errors.
      */
@@ -104,7 +104,7 @@ public class PKCS7 {
     /**
      * Unmarshals a PKCS7 block from its encoded form, parsing the
      * encoded bytes.
-     * 
+     *
      * @param bytes the encoded bytes.
      * @exception ParsingException on parsing errors.
      */
@@ -133,7 +133,7 @@ public class PKCS7 {
 
     /**
      * Construct an initialized PKCS7 block.
-     * 
+     *
      * @param digestAlgorithmIds the message digest algorithm identifiers.
      * @param contentInfo the content information.
      * @param certificates an array of X.509 certificates.
@@ -224,7 +224,7 @@ public class PKCS7 {
 
     /**
      * Encodes the signed data to an output stream.
-     * 
+     *
      * @param out the output stream to write the encoded data to.
      * @exception IOException on encoding errors.
      */
@@ -254,7 +254,7 @@ public class PKCS7 {
 
     /**
      * Encodes the signed data to a DerOutputStream.
-     * 
+     *
      * @param out the DerOutputStream to write the encoded data to.
      * @exception IOException on encoding errors.
      */
@@ -313,10 +313,10 @@ public class PKCS7 {
 
     /**
      * This verifies a given SignerInfo.
-     * 
+     *
      * @param info the signer information.
      * @param bytes the DER encoded content information.
-     * 
+     *
      * @exception NoSuchAlgorithmException on unrecognized algorithms.
      * @exception SignatureException on signature handling errors.
      */
@@ -327,9 +327,9 @@ public class PKCS7 {
 
     /**
      * Returns all signerInfos which self-verify.
-     * 
+     *
      * @param bytes the DER encoded content information.
-     * 
+     *
      * @exception NoSuchAlgorithmException on unrecognized algorithms.
      * @exception SignatureException on signature handling errors.
      */
@@ -355,7 +355,7 @@ public class PKCS7 {
 
     /**
      * Returns all signerInfos which self-verify.
-     * 
+     *
      * @exception NoSuchAlgorithmException on unrecognized algorithms.
      * @exception SignatureException on signature handling errors.
      */
@@ -403,7 +403,7 @@ public class PKCS7 {
      * Returns the X.509 certificate listed in this PKCS7 block
      * which has a matching serial number and Issuer name, or
      * null if one is not found.
-     * 
+     *
      * @param serial the serial number of the certificate to retrieve.
      * @param name the Distinguished Name of the Issuer.
      */
diff --git a/base/util/src/netscape/security/pkcs/PKCS8Key.java b/base/util/src/netscape/security/pkcs/PKCS8Key.java
index 7c5f64582..db1d6b275 100644
--- a/base/util/src/netscape/security/pkcs/PKCS8Key.java
+++ b/base/util/src/netscape/security/pkcs/PKCS8Key.java
@@ -39,7 +39,7 @@ import netscape.security.x509.AlgorithmId;
 
 /**
  * Holds a PKCS#8 key, for example a private key
- * 
+ *
  * @version 1.30, 97/12/10
  * @author Dave Brownell
  * @author Benjamin Renaud
@@ -74,12 +74,12 @@ public class PKCS8Key implements PrivateKey {
      * the runtime environment is configured with a specific class for
      * this kind of key, a subclass is returned. Otherwise, a generic
      * PKCS8Key object is returned.
-     * 
+     *
      * <P>
      * This mechanism gurantees that keys (and algorithms) may be freely manipulated and transferred, without risk of
      * losing information. Also, when a key (or algorithm) needs some special handling, that specific need can be
      * accomodated.
-     * 
+     *
      * @param in the DER-encoded SubjectPublicKeyInfo value
      * @exception IOException on data format errors
      */
@@ -117,11 +117,11 @@ public class PKCS8Key implements PrivateKey {
      * keys encapsulate two unsigned integers (modulus and exponent) as
      * DER values within the <code>key</code> bits; Diffie-Hellman and
      * DSS/DSA keys encapsulate a single unsigned integer.
-     * 
+     *
      * <P>
      * This function is called when creating PKCS#8 SubjectPublicKeyInfo values using the PKCS8Key member functions,
      * such as <code>parse</code> and <code>decode</code>.
-     * 
+     *
      * @exception IOException if a parsing error occurs.
      * @exception InvalidKeyException if the key encoding is invalid.
      */
@@ -248,7 +248,7 @@ public class PKCS8Key implements PrivateKey {
 
     /**
      * Returns the DER-encoded form of the key as a byte array.
-     * 
+     *
      * @exception InvalidKeyException if an encoding error occurs.
      */
     public byte[] encode() throws InvalidKeyException {
@@ -286,14 +286,14 @@ public class PKCS8Key implements PrivateKey {
      * PKCS#8 format: a sequence consisting of a version, an algorithm
      * ID and a bit string which holds the key. (That bit string is
      * often used to encapsulate another DER encoded sequence.)
-     * 
+     *
      * <P>
      * Subclasses should not normally redefine this method; they should instead provide a <code>parseKeyBits</code>
      * method to parse any fields inside the <code>key</code> member.
-     * 
+     *
      * @param in an input stream with a DER-encoded PKCS#8
      *            SubjectPublicKeyInfo value
-     * 
+     *
      * @exception InvalidKeyException if a parsing error occurs.
      */
     public void decode(InputStream in) throws InvalidKeyException {
@@ -381,7 +381,7 @@ public class PKCS8Key implements PrivateKey {
      * to compare is not of type <code>Key</code>.
      * Otherwise, the encoding of this key object is compared with the
      * encoding of the given key object.
-     * 
+     *
      * @param object the object with which to compare
      * @return <code>true</code> if this key has the same encoding as the
      *         object argument; <code>false</code> otherwise.
diff --git a/base/util/src/netscape/security/pkcs/PKCS9Attribute.java b/base/util/src/netscape/security/pkcs/PKCS9Attribute.java
index 6a6fd7dc9..1239ccaf3 100644
--- a/base/util/src/netscape/security/pkcs/PKCS9Attribute.java
+++ b/base/util/src/netscape/security/pkcs/PKCS9Attribute.java
@@ -34,7 +34,7 @@ import netscape.security.x509.CertificateExtensions;
  * Class supporting any PKCS9 attribute except
  * ExtendedCertificateAttribute. Supports DER decoding and access to
  * attribute values, but not DER encoding or setting of values.
- * 
+ *
  * @version 1.2 97/12/10
  * @author Douglas Hoover
  */
@@ -51,7 +51,7 @@ public class PKCS9Attribute implements DerEncoder {
      * Array of attribute OIDs defined in PKCS9, by number.
      */
     static final ObjectIdentifier[] PKCS9_OIDS =
-            //new ObjectIdentifier[10]; 
+            //new ObjectIdentifier[10];
             // There are some Obsolete(?) attribute identifiers.
             // This is mainly for extensionRequest (14) in pkcs10.
             // We just add the other 4 as by products.
@@ -174,118 +174,118 @@ public class PKCS9Attribute implements DerEncoder {
     /**
      * Class types required for values for a given PKCS9
      * attribute type.
-     * 
+     *
      * <P>
      * The following table shows the correspondence between attribute types and value component classes.
-     * 
+     *
      * <P>
      * <TABLE BORDER CELLPADDING=8 ALIGN=CENTER>
-     * 
+     *
      * <TR>
      * <TH>OID</TH>
      * <TH>Attribute Type Name</TH>
      * <TH>Kind</TH>
      * <TH>Value Class</TH>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.1</TD>
      * <TD>EmailAddress</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>String[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.2</TD>
      * <TD>UnstructuredName</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>String</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.3</TD>
      * <TD>ContentType</TD>
      * <TD>Single-valued</TD>
      * <TD><code>ObjectIdentifier</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.4</TD>
      * <TD>MessageDigest</TD>
      * <TD>Single-valued</TD>
      * <TD><code>byte[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.5</TD>
      * <TD>SigningTime</TD>
      * <TD>Single-valued</TD>
      * <TD><code>Date</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.6</TD>
      * <TD>Countersignature</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>SignerInfo</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.7</TD>
      * <TD>ChallengePassword</TD>
      * <TD>Single-valued</TD>
      * <TD><code>String</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.8</TD>
      * <TD>UnstructuredAddress</TD>
      * <TD>Single-valued</TD>
      * <TD><code>String</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.9</TD>
      * <TD>ExtendedCertificateAttributes</TD>
      * <TD>Multiple-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.10</TD>
      * <TD>IssuerAndSerialNumber</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.11</TD>
      * <TD>PasswordCheck</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.12</TD>
      * <TD>PublicKey</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.13</TD>
      * <TD>SigningDescription</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.14</TD>
      * <TD>ExtensionRequest</TD>
      * <TD>Single-valued</TD>
      * <TD><code>Sequence</code></TD>
      * </TR>
-     * 
+     *
      * </TABLE>
      */
     private static final Class<?>[] VALUE_CLASSES = new Class[15];
@@ -348,118 +348,118 @@ public class PKCS9Attribute implements DerEncoder {
      * value. If the attribute is
      * multiple-valued, provide an array containing all the values.
      * Arrays of length zero are accepted, though probably useless.
-     * 
+     *
      * <P>
      * The following table gives the class that <code>value</code> must have for a given attribute.
-     * 
+     *
      * <P>
      * <TABLE BORDER CELLPADDING=8 ALIGN=CENTER>
-     * 
+     *
      * <TR>
      * <TH>OID</TH>
      * <TH>Attribute Type Name</TH>
      * <TH>Kind</TH>
      * <TH>Value Class</TH>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.1</TD>
      * <TD>EmailAddress</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>String[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.2</TD>
      * <TD>UnstructuredName</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>String[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.3</TD>
      * <TD>ContentType</TD>
      * <TD>Single-valued</TD>
      * <TD><code>ObjectIdentifier</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.4</TD>
      * <TD>MessageDigest</TD>
      * <TD>Single-valued</TD>
      * <TD><code>byte[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.5</TD>
      * <TD>SigningTime</TD>
      * <TD>Single-valued</TD>
      * <TD><code>Date</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.6</TD>
      * <TD>Countersignature</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>SignerInfo[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.7</TD>
      * <TD>ChallengePassword</TD>
      * <TD>Single-valued</TD>
      * <TD><code>String</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.8</TD>
      * <TD>UnstructuredAddress</TD>
      * <TD>Single-valued</TD>
      * <TD><code>String[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.9</TD>
      * <TD>ExtendedCertificateAttributes</TD>
      * <TD>Multiple-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.10</TD>
      * <TD>IssuerAndSerialNumber</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.11</TD>
      * <TD>PasswordCheck</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.12</TD>
      * <TD>PublicKey</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.13</TD>
      * <TD>SigningDescription</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.14</TD>
      * <TD>ExtensionRequest</TD>
      * <TD>Single-valued</TD>
      * <TD><code>Sequence</code></TD>
      * </TR>
-     * 
+     *
      * </TABLE>
      */
     public PKCS9Attribute(ObjectIdentifier oid, Object value)
@@ -474,121 +474,121 @@ public class PKCS9Attribute implements DerEncoder {
      * value. If the attribute is
      * multiple-valued, provide an array containing all the values.
      * Arrays of length zero are accepted, though probably useless.
-     * 
+     *
      * <P>
      * The following table gives the class that <code>value</code> must have for a given attribute. Reasonable variants
      * of these attributes are accepted; in particular, case does not matter.
-     * 
+     *
      * <P>
      * <TABLE BORDER CELLPADDING=8 ALIGN=CENTER>
-     * 
+     *
      * <TR>
      * <TH>OID</TH>
      * <TH>Attribute Type Name</TH>
      * <TH>Kind</TH>
      * <TH>Value Class</TH>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.1</TD>
      * <TD>EmailAddress</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>String[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.2</TD>
      * <TD>UnstructuredName</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>String[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.3</TD>
      * <TD>ContentType</TD>
      * <TD>Single-valued</TD>
      * <TD><code>ObjectIdentifier</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.4</TD>
      * <TD>MessageDigest</TD>
      * <TD>Single-valued</TD>
      * <TD><code>byte[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.5</TD>
      * <TD>SigningTime</TD>
      * <TD>Single-valued</TD>
      * <TD><code>Date</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.6</TD>
      * <TD>Countersignature</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>SignerInfo[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.7</TD>
      * <TD>ChallengePassword</TD>
      * <TD>Single-valued</TD>
      * <TD><code>String</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.8</TD>
      * <TD>UnstructuredAddress</TD>
      * <TD>Single-valued</TD>
      * <TD><code>String[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.9</TD>
      * <TD>ExtendedCertificateAttributes</TD>
      * <TD>Multiple-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.10</TD>
      * <TD>IssuerAndSerialNumber</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.11</TD>
      * <TD>PasswordCheck</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.12</TD>
      * <TD>PublicKey</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.13</TD>
      * <TD>SigningDescription</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.14</TD>
      * <TD>ExtensionRequest</TD>
      * <TD>Single-valued</TD>
      * <TD><code>Sequence</code></TD>
      * </TR>
-     * 
+     *
      * </TABLE>
-     * 
+     *
      * @exception IllegalArgumentException
      *                if the <code>name</code> is not recognized of the <code>value</code> has the wrong type.
      */
@@ -628,7 +628,7 @@ public class PKCS9Attribute implements DerEncoder {
     /**
      * Construct a PKCS9Attribute from its encoding on an input
      * stream.
-     * 
+     *
      * @exception IOException on parsing error.
      */
     public PKCS9Attribute(DerValue derVal) throws IOException {
@@ -638,7 +638,7 @@ public class PKCS9Attribute implements DerEncoder {
 
     /**
      * Decode a PKCS9 attribute.
-     * 
+     *
      * @param val
      *            the DerValue representing the DER encoding of the attribute.
      */
@@ -752,7 +752,7 @@ public class PKCS9Attribute implements DerEncoder {
 
     /**
      * Write the DER encoding of this attribute to an output stream.
-     * 
+     *
      * <P>
      * N.B.: This method always encodes values of ChallengePassword and UnstructuredAddress attributes as ASN.1
      * <code>PrintableString</code>s, without checking whether they should be encoded as <code>T61String</code>s.
@@ -876,120 +876,120 @@ public class PKCS9Attribute implements DerEncoder {
      * single-valued, return just the one value. If the attribute is
      * multiple-valued, return an array containing all the values.
      * It is possible for this array to be of length 0.
-     * 
+     *
      * <P>
      * The following table gives the class of the value returned, depending on the type of this attribute.
-     * 
+     *
      * <P>
      * <TABLE BORDER CELLPADDING=8 ALIGN=CENTER>
-     * 
+     *
      * <TR>
      * <TH>OID</TH>
      * <TH>Attribute Type Name</TH>
      * <TH>Kind</TH>
      * <TH>Value Class</TH>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.1</TD>
      * <TD>EmailAddress</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>String[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.2</TD>
      * <TD>UnstructuredName</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>String[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.3</TD>
      * <TD>ContentType</TD>
      * <TD>Single-valued</TD>
      * <TD><code>ObjectIdentifier</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.4</TD>
      * <TD>MessageDigest</TD>
      * <TD>Single-valued</TD>
      * <TD><code>byte[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.5</TD>
      * <TD>SigningTime</TD>
      * <TD>Single-valued</TD>
      * <TD><code>Date</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.6</TD>
      * <TD>Countersignature</TD>
      * <TD>Multiple-valued</TD>
      * <TD><code>SignerInfo[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.7</TD>
      * <TD>ChallengePassword</TD>
      * <TD>Single-valued</TD>
      * <TD><code>String</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.8</TD>
      * <TD>UnstructuredAddress</TD>
      * <TD>Single-valued</TD>
      * <TD><code>String[]</code></TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.9</TD>
      * <TD>ExtendedCertificateAttributes</TD>
      * <TD>Multiple-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.10</TD>
      * <TD>IssuerAndSerialNumber</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.11</TD>
      * <TD>PasswordCheck</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.12</TD>
      * <TD>PublicKey</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.13</TD>
      * <TD>SigningDescription</TD>
      * <TD>Single-valued</TD>
      * <TD>(not supported)</TD>
      * </TR>
-     * 
+     *
      * <TR>
      * <TD>1.2.840.113549.1.9.14</TD>
      * <TD>ExtensionRequest</TD>
      * <TD>Single-valued</TD>
      * <TD><code>Sequence</code></TD>
      * </TR>
-     * 
+     *
      * </TABLE>
-     * 
+     *
      */
     public Object getValue() {
         return value;
@@ -1073,7 +1073,7 @@ public class PKCS9Attribute implements DerEncoder {
     /**
      * Beginning the search at <code>start</code>, find the first
      * index <code>i</code> such that <code>a[i] = obj</code>.
-     * 
+     *
      * @return the index, if found, and -1 otherwise.
      */
     static int indexOf(Object obj, Object[] a, int start) {
diff --git a/base/util/src/netscape/security/pkcs/PKCS9Attributes.java b/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
index 485cdded1..39bf2340e 100644
--- a/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
+++ b/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
@@ -29,7 +29,7 @@ import netscape.security.util.ObjectIdentifier;
 
 /**
  * A set of attributes of class PKCS9Attribute.
- * 
+ *
  * @version 1.2 97/12/10
  * @author Douglas Hoover
  */
@@ -57,16 +57,16 @@ public class PKCS9Attributes {
      * with OIDs on the given
      * list. If the array is null, accept all attributes supported by
      * class PKCS9Attribute.
-     * 
+     *
      * @param permittedAttributes
      *            Array of attribute OIDs that will be accepted.
      * @param buf
      *            the contents of the DER encoding of the attribute set.
-     * 
+     *
      * @exception IOException
      *                on i/o error, encoding syntax error, unacceptable or
      *                unsupported attribute, or duplicate attribute.
-     * 
+     *
      * @see PKCS9Attribute
      */
     public PKCS9Attributes(ObjectIdentifier[] permittedAttributes,
@@ -90,11 +90,11 @@ public class PKCS9Attributes {
      * Construct a set of PKCS9 Attributes from its contents of its
      * DER encoding on a DerInputStream. Accept all attributes
      * supported by class PKCS9Attribute.
-     * 
+     *
      * @exception IOException
      *                on i/o error, encoding syntax error, or unsupported or
      *                duplicate attribute.
-     * 
+     *
      * @see PKCS9Attribute
      */
     public PKCS9Attributes(DerInputStream in) throws IOException {
@@ -109,11 +109,11 @@ public class PKCS9Attributes {
      * PCK9 attributes.
      * DER encoding on a DerInputStream. All attributes in <code>attribs</code> must be
      * supported by class PKCS9Attribute.
-     * 
+     *
      * @exception IOException
      *                on i/o error, encoding syntax error, or unsupported or
      *                duplicate attribute.
-     * 
+     *
      * @see PKCS9Attribute
      */
     public PKCS9Attributes(PKCS9Attribute[] attribs)
@@ -136,10 +136,10 @@ public class PKCS9Attributes {
     /**
      * Decode this set of PKCS9 attribute set from the contents of its
      * DER encoding.
-     * 
+     *
      * @param buf
      *            the contents of the DER encoding of the attribute set.
-     * 
+     *
      * @exception IOException
      *                on i/o error, encoding syntax error, unacceptable or
      *                unsupported attribute, or duplicate attribute.
@@ -179,10 +179,10 @@ public class PKCS9Attributes {
     /**
      * Put the DER encoding of this PKCS9 attribute set on an
      * DerOutputStream, tagged with the given implicit tag.
-     * 
+     *
      * @param tag the implicit tag to use in the DER encoding.
      * @param out the output stream on which to put the DER encoding.
-     * 
+     *
      * @exception IOException on output error.
      */
     public void encode(byte tag, OutputStream out) throws IOException {
@@ -282,7 +282,7 @@ public class PKCS9Attributes {
             if (value == null)
                 continue;
 
-            // we have a value; print it 
+            // we have a value; print it
             if (first)
                 first = false;
             else
diff --git a/base/util/src/netscape/security/pkcs/SignerInfo.java b/base/util/src/netscape/security/pkcs/SignerInfo.java
index adb0115cc..794033c87 100644
--- a/base/util/src/netscape/security/pkcs/SignerInfo.java
+++ b/base/util/src/netscape/security/pkcs/SignerInfo.java
@@ -38,7 +38,7 @@ import netscape.security.x509.X500Name;
 
 /**
  * A SignerInfo, as defined in PKCS#7's signedData type.
- * 
+ *
  * @author Benjamin Renaud
  * @version 1.27 97/12/10
  */
@@ -110,7 +110,7 @@ public class SignerInfo implements DerEncoder {
             authenticatedAttributes = new PKCS9Attributes(derin);
         }
 
-        // digestEncryptionAlgorithmId - little RSA naming scheme - 
+        // digestEncryptionAlgorithmId - little RSA naming scheme -
         // signature == encryption...
         tmp = derin.getDerValue();
 
@@ -141,10 +141,10 @@ public class SignerInfo implements DerEncoder {
     /**
      * DER encode this object onto an output stream.
      * Implements the <code>DerEncoder</code> interface.
-     * 
+     *
      * @param out
      *            the output stream on which to write the DER encoding.
-     * 
+     *
      * @exception IOException on encoding error.
      */
     public void derEncode(OutputStream out) throws IOException {
@@ -229,11 +229,11 @@ public class SignerInfo implements DerEncoder {
                         return null;
                 }
 
-                // message digest attribute matched 
+                // message digest attribute matched
                 // digest of original data
 
-                // the data actually signed is the DER encoding of 
-                // the authenticated attributes (tagged with 
+                // the data actually signed is the DER encoding of
+                // the authenticated attributes (tagged with
                 // the "SET OF" tag, not 0xA0).
                 dataSigned = authenticatedAttributes.getDerEncoding();
             }