2006-06-24 Raif S. Naffah <raif@swiftdsl.com.au>

	* gnu/java/security/util/Util.java: Source formatting.
	* gnu/java/security/util/SimpleList.java: Likewise.
	* gnu/java/security/util/Sequence.java: Likewise.
	* gnu/java/security/util/PRNG.java: Likewise.
	* gnu/java/security/util/ExpirableObject.java: Likewise.
	* gnu/java/security/util/Base64.java: Likewise.
	* gnu/java/security/sig/SignatureFactory.java: Likewise.
	* gnu/java/security/sig/ISignatureCodec.java: Likewise.
	* gnu/java/security/sig/ISignature.java: Likewise.
	* gnu/java/security/sig/BaseSignature.java: Likewise.
	* gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java: Likewise.
	* gnu/java/security/sig/rsa/RSAPSSSignature.java: Likewise.
	* gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java: Likewise.
	* gnu/java/security/sig/rsa/RSA.java: Likewise.
	* gnu/java/security/sig/rsa/EMSA_PSS.java: Likewise.
	* gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java: Likewise.
	* gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java: Likewise.
	* gnu/java/security/sig/dss/DSSSignatureRawCodec.java: Likewise.
	* gnu/java/security/sig/dss/DSSSignature.java: Likewise.
	* gnu/java/security/provider/X509CertificateFactory.java: Likewise.
	* gnu/java/security/provider/PKIXCertPathValidatorImpl.java: Likewise.
	* gnu/java/security/provider/Gnu.java: Likewise.
	* gnu/java/security/prng/RandomEventListener.java: Likewise.
	* gnu/java/security/prng/RandomEvent.java: Likewise.
	* gnu/java/security/prng/PRNGFactory.java: Likewise.
	* gnu/java/security/prng/MDGenerator.java: Likewise.
	* gnu/java/security/prng/LimitReachedException.java: Likewise.
	* gnu/java/security/prng/IRandom.java: Likewise.
	* gnu/java/security/prng/EntropySource.java: Likewise.
	* gnu/java/security/prng/BasePRNG.java: Likewise.

1 files changed, 67 insertions, 137 deletions

diff --git a/gnu/java/security/sig/dss/DSSSignature.java b/gnu/java/security/sig/dss/DSSSignature.java
index 370a93854..1ef1bea1a 100644
--- a/gnu/java/security/sig/dss/DSSSignature.java
+++ b/gnu/java/security/sig/dss/DSSSignature.java
@@ -55,72 +55,65 @@ import java.util.Map;
 import java.util.Random;
 
 /**
- * <p>The DSS (Digital Signature Standard) algorithm makes use of the following
- * parameters:</p>
- *
+ * The DSS (Digital Signature Standard) algorithm makes use of the following
+ * parameters:
  * <ol>
- *    <li>p: A prime modulus, where <code>2<sup>L-1</sup> &lt; p &lt; 2<sup>L</sup>
- *    </code> for <code>512 &lt;= L &lt;= 1024</code> and <code>L</code> a
- *    multiple of <code>64</code>.</li>
- *    <li>q: A prime divisor of <code>p - 1</code>, where <code>2<sup>159</sup>
+ * <li>p: A prime modulus, where
+ * <code>2<sup>L-1</sup> &lt; p &lt; 2<sup>L</sup> </code> for <code>512 &lt;= L
+ * &lt;= 1024</code> and <code>L</code> a multiple of <code>64</code>.</li>
+ * <li>q: A prime divisor of <code>p - 1</code>, where <code>2<sup>159</sup>
  *    &lt; q &lt; 2<sup>160</sup></code>.</li>
- *    <li>g: Where <code>g = h<sup>(p-1)</sup>/q mod p</code>, where
- *    <code>h</code> is any integer with <code>1 &lt; h &lt; p - 1</code> such
- *    that <code>h<sup> (p-1)</sup>/q mod p > 1</code> (<code>g</code> has order
- *    <code>q mod p</code>).</li>
- *    <li>x: A randomly or pseudorandomly generated integer with <code>0 &lt; x
+ * <li>g: Where <code>g = h<sup>(p-1)</sup>/q mod p</code>, where
+ * <code>h</code> is any integer with <code>1 &lt; h &lt; p - 1</code> such
+ * that <code>h<sup> (p-1)</sup>/q mod p > 1</code> (<code>g</code> has order
+ * <code>q mod p</code>).</li>
+ * <li>x: A randomly or pseudorandomly generated integer with <code>0 &lt; x
  *    &lt; q</code>.</li>
- *    <li>y: <code>y = g<sup>x</sup> mod p</code>.</li>
- *    <li>k: A randomly or pseudorandomly generated integer with <code>0 &lt; k
+ * <li>y: <code>y = g<sup>x</sup> mod p</code>.</li>
+ * <li>k: A randomly or pseudorandomly generated integer with <code>0 &lt; k
  *    &lt; q</code>.</li>
  * </ol>
- *
- * <p>The integers <code>p</code>, <code>q</code>, and <code>g</code> can be
+ * <p>
+ * The integers <code>p</code>, <code>q</code>, and <code>g</code> can be
  * public and can be common to a group of users. A user's private and public
- * keys are <code>x</code> and <code>y</code>, respectively. They are normally
- * fixed for a period of time. Parameters <code>x</code> and <code>k</code> are
- * used for signature generation only, and must be kept secret. Parameter
- * <code>k</code> must be regenerated for each signature.</p>
- *
- * <p>The signature of a message <code>M</code> is the pair of numbers <code>r</code>
- * and <code>s</code> computed according to the equations below:</p>
- *
+ * keys are <code>x</code> and <code>y</code>, respectively. They are
+ * normally fixed for a period of time. Parameters <code>x</code> and
+ * <code>k</code> are used for signature generation only, and must be kept
+ * secret. Parameter <code>k</code> must be regenerated for each signature.
+ * <p>
+ * The signature of a message <code>M</code> is the pair of numbers
+ * <code>r</code> and <code>s</code> computed according to the equations below:
  * <ul>
- *    <li><code>r = (g<sup>k</sup> mod p) mod q</code> and</li>
- *    <li><code>s = (k<sup>-1</sup>(SHA(M) + xr)) mod q</code>.</li>
+ * <li><code>r = (g<sup>k</sup> mod p) mod q</code> and</li>
+ * <li><code>s = (k<sup>-1</sup>(SHA(M) + xr)) mod q</code>.</li>
  * </ul>
- *
- * <p>In the above, <code>k<sup>-1</sup></code> is the multiplicative inverse of
- * <code>k</code>, <code>mod q</code>; i.e., <code>(k<sup>-1</sup> k) mod q = 1
- * </code> and <code>0 &lt; k-1 &lt; q</code>. The value of <code>SHA(M)</code>
- * is a 160-bit string output by the Secure Hash Algorithm specified in FIPS 180.
- * For use in computing <code>s</code>, this string must be converted to an
- * integer.</p>
- *
- * <p>As an option, one may wish to check if <code>r == 0</code> or <code>s == 0
- * </code>. If either <code>r == 0</code> or <code>s == 0</code>, a new value
- * of <code>k</code> should be generated and the signature should be
- * recalculated (it is extremely unlikely that <code>r == 0</code> or <code>s ==
- * 0</code> if signatures are generated properly).</p>
- *
- * <p>The signature is transmitted along with the message to the verifier.</p>
- *
- * <p>References:</p>
+ * <p>
+ * In the above, <code>k<sup>-1</sup></code> is the multiplicative inverse of
+ * <code>k</code>, <code>mod q</code>; i.e., <code>(k<sup>-1</sup> k) mod q =
+ * 1</code> and <code>0 &lt; k-1 &lt; q</code>. The value of <code>SHA(M)</code>
+ * is a 160-bit string output by the Secure Hash Algorithm specified in FIPS
+ * 180. For use in computing <code>s</code>, this string must be converted to
+ * an integer.
+ * <p>
+ * As an option, one may wish to check if <code>r == 0</code> or <code>s == 0
+ * </code>.
+ * If either <code>r == 0</code> or <code>s == 0</code>, a new value of
+ * <code>k</code> should be generated and the signature should be recalculated
+ * (it is extremely unlikely that <code>r == 0</code> or <code>s == 0</code> if
+ * signatures are generated properly).
+ * <p>
+ * The signature is transmitted along with the message to the verifier.
+ * <p>
+ * References:
  * <ol>
- *    <li><a href="http://www.itl.nist.gov/fipspubs/fip186.htm">Digital
- *    Signature Standard (DSS)</a>, Federal Information Processing Standards
- *    Publication 186. National Institute of Standards and Technology.</li>
+ * <li><a href="http://www.itl.nist.gov/fipspubs/fip186.htm">Digital Signature
+ * Standard (DSS)</a>, Federal Information Processing Standards Publication
+ * 186. National Institute of Standards and Technology.</li>
  * </ol>
  */
-public class DSSSignature extends BaseSignature
+public class DSSSignature
+    extends BaseSignature
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   /** Trivial 0-arguments constructor. */
   public DSSSignature()
   {
@@ -137,16 +130,12 @@ public class DSSSignature extends BaseSignature
     this.md = (IMessageDigest) that.md.clone();
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
   public static final BigInteger[] sign(final DSAPrivateKey k, final byte[] h)
   {
     final DSSSignature sig = new DSSSignature();
     final Map attributes = new HashMap();
     attributes.put(ISignature.SIGNER_KEY, k);
     sig.setupSign(attributes);
-
     return sig.computeRS(h);
   }
 
@@ -157,11 +146,9 @@ public class DSSSignature extends BaseSignature
     final Map attributes = new HashMap();
     attributes.put(ISignature.SIGNER_KEY, k);
     if (rnd != null)
-      {
-        attributes.put(ISignature.SOURCE_OF_RANDOMNESS, rnd);
-      }
-    sig.setupSign(attributes);
+      attributes.put(ISignature.SOURCE_OF_RANDOMNESS, rnd);
 
+    sig.setupSign(attributes);
     return sig.computeRS(h);
   }
 
@@ -172,11 +159,9 @@ public class DSSSignature extends BaseSignature
     final Map attributes = new HashMap();
     attributes.put(ISignature.SIGNER_KEY, k);
     if (irnd != null)
-      {
-        attributes.put(ISignature.SOURCE_OF_RANDOMNESS, irnd);
-      }
-    sig.setupSign(attributes);
+      attributes.put(ISignature.SOURCE_OF_RANDOMNESS, irnd);
 
+    sig.setupSign(attributes);
     return sig.computeRS(h);
   }
 
@@ -187,13 +172,9 @@ public class DSSSignature extends BaseSignature
     final Map attributes = new HashMap();
     attributes.put(ISignature.VERIFIER_KEY, k);
     sig.setupVerify(attributes);
-
     return sig.checkRS(rs, h);
   }
 
-  // Implementation of abstract methods in superclass
-  // -------------------------------------------------------------------------
-
   public Object clone()
   {
     return new DSSSignature(this);
@@ -202,81 +183,37 @@ public class DSSSignature extends BaseSignature
   protected void setupForVerification(PublicKey k)
       throws IllegalArgumentException
   {
-    if (!(k instanceof DSAPublicKey))
-      {
-        throw new IllegalArgumentException();
-      }
+    if (! (k instanceof DSAPublicKey))
+      throw new IllegalArgumentException();
+
     this.publicKey = k;
   }
 
   protected void setupForSigning(PrivateKey k) throws IllegalArgumentException
   {
-    if (!(k instanceof DSAPrivateKey))
-      {
-        throw new IllegalArgumentException();
-      }
+    if (! (k instanceof DSAPrivateKey))
+      throw new IllegalArgumentException();
+
     this.privateKey = k;
   }
 
   protected Object generateSignature() throws IllegalStateException
   {
-    //      BigInteger p = ((DSAPrivateKey) privateKey).getParams().getP();
-    //      BigInteger q = ((DSAPrivateKey) privateKey).getParams().getQ();
-    //      BigInteger g = ((DSAPrivateKey) privateKey).getParams().getG();
-    //      BigInteger x = ((DSAPrivateKey) privateKey).getX();
-    //      BigInteger m = new BigInteger(1, md.digest());
-    //      BigInteger k, r, s;
-    //
-    //      byte[] kb = new byte[20]; // we'll use 159 bits only
-    //      while (true) {
-    //         this.nextRandomBytes(kb);
-    //         k = new BigInteger(1, kb);
-    //         k.clearBit(159);
-    //         r = g.modPow(k, p).mod(q);
-    //         if (r.equals(BigInteger.ZERO)) {
-    //            continue;
-    //         }
-    //         s = m.add(x.multiply(r)).multiply(k.modInverse(q)).mod(q);
-    //         if (s.equals(BigInteger.ZERO)) {
-    //            continue;
-    //         }
-    //         break;
-    //      }
     final BigInteger[] rs = computeRS(md.digest());
-
-    //      return encodeSignature(r, s);
     return encodeSignature(rs[0], rs[1]);
   }
 
   protected boolean verifySignature(Object sig) throws IllegalStateException
   {
     final BigInteger[] rs = decodeSignature(sig);
-    //      BigInteger r = rs[0];
-    //      BigInteger s = rs[1];
-    //
-    //      BigInteger g = ((DSAPublicKey) publicKey).getParams().getG();
-    //      BigInteger p = ((DSAPublicKey) publicKey).getParams().getP();
-    //      BigInteger q = ((DSAPublicKey) publicKey).getParams().getQ();
-    //      BigInteger y = ((DSAPublicKey) publicKey).getY();
-    //      BigInteger w = s.modInverse(q);
-    //
-    //      byte bytes[] = md.digest();
-    //      BigInteger u1 = w.multiply(new BigInteger(1, bytes)).mod(q);
-    //      BigInteger u2 = r.multiply(w).mod(q);
-    //
-    //      BigInteger v = g.modPow(u1, p).multiply(y.modPow(u2, p)).mod(p).mod(q);
-    //      return v.equals(r);
     return checkRS(rs, md.digest());
   }
 
-  // Other instance methods
-  // -------------------------------------------------------------------------
-
   /**
-   * Returns the output of a signature generation phase.<p>
-   *
+   * Returns the output of a signature generation phase.
+   * 
    * @return an object encapsulating the DSS signature pair <code>r</code> and
-   * <code>s</code>.
+   *         <code>s</code>.
    */
   private Object encodeSignature(BigInteger r, BigInteger s)
   {
@@ -284,9 +221,9 @@ public class DSSSignature extends BaseSignature
   }
 
   /**
-   * Returns the output of a previously generated signature object as a pair
-   * of {@link java.math.BigInteger}.<p>
-   *
+   * Returns the output of a previously generated signature object as a pair of
+   * {@link java.math.BigInteger}.
+   * 
    * @return the DSS signature pair <code>r</code> and <code>s</code>.
    */
   private BigInteger[] decodeSignature(Object signature)
@@ -302,7 +239,6 @@ public class DSSSignature extends BaseSignature
     final BigInteger x = ((DSAPrivateKey) privateKey).getX();
     final BigInteger m = new BigInteger(1, digestBytes);
     BigInteger k, r, s;
-
     final byte[] kb = new byte[20]; // we'll use 159 bits only
     while (true)
       {
@@ -311,17 +247,14 @@ public class DSSSignature extends BaseSignature
         k.clearBit(159);
         r = g.modPow(k, p).mod(q);
         if (r.equals(BigInteger.ZERO))
-          {
-            continue;
-          }
+          continue;
+
         s = m.add(x.multiply(r)).multiply(k.modInverse(q)).mod(q);
         if (s.equals(BigInteger.ZERO))
-          {
-            continue;
-          }
+          continue;
+
         break;
       }
-
     return new BigInteger[] { r, s };
   }
 
@@ -329,16 +262,13 @@ public class DSSSignature extends BaseSignature
   {
     final BigInteger r = rs[0];
     final BigInteger s = rs[1];
-
     final BigInteger g = ((DSAPublicKey) publicKey).getParams().getG();
     final BigInteger p = ((DSAPublicKey) publicKey).getParams().getP();
     final BigInteger q = ((DSAPublicKey) publicKey).getParams().getQ();
     final BigInteger y = ((DSAPublicKey) publicKey).getY();
     final BigInteger w = s.modInverse(q);
-
     final BigInteger u1 = w.multiply(new BigInteger(1, digestBytes)).mod(q);
     final BigInteger u2 = r.multiply(w).mod(q);
-
     final BigInteger v = g.modPow(u1, p).multiply(y.modPow(u2, p)).mod(p).mod(q);
     return v.equals(r);
   }