--- /home/cpdev/src/classpath/gnu/java/security/provider/SHA1PRNG.java	2005-07-02 21:03:09.000000000 +0000
+++ gnu/java/security/provider/SHA1PRNG.java	2005-06-30 05:34:11.000000000 +0000
@@ -1,5 +1,5 @@
 /* SHA1PRNG.java --- Secure Random SPI SHA1PRNG
-   Copyright (C) 1999, 2001, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -52,18 +52,7 @@
   int seedpos;
   int datapos;
   private boolean seeded = false; // set to true when we seed this
-  /**
-   * The size of seed.
-   */
-  private static final int SEED_SIZE = 20;
-  /**
-   * The size of data.
-   */
-  private static final int DATA_SIZE = 40;
-
-  /**
-   * Create a new SHA-1 pseudo-random number generator.
-   */
+
   public SHA1PRNG()
   {
     try {
@@ -74,17 +63,17 @@
       throw new InternalError ("no SHA implementation found");
     }
 
-    seed = new byte[SEED_SIZE];
+    seed = new byte[20];
     seedpos = 0;
-    data = new byte[DATA_SIZE];
-    datapos = SEED_SIZE;  // try to force hashing a first block
+    data = new byte[40];
+    datapos = 20;  // try to force hashing a first block
   }
 
   public void engineSetSeed(byte[] seed)
   {
     for(int i = 0; i < seed.length; i++)
-      this.seed[seedpos++ % SEED_SIZE] ^= seed[i];
-    seedpos %= SEED_SIZE;
+      this.seed[seedpos++ % 20] ^= seed[i];
+    seedpos %= 20;
 
   }
 
@@ -94,7 +83,7 @@
     int loc = 0;
     while (loc < bytes.length)
       {
-	int copy = Math.min (bytes.length - loc, SEED_SIZE - datapos);
+	int copy = Math.min (bytes.length - loc, 20 - datapos);
 
 	if (copy > 0)
 	  {
@@ -105,9 +94,9 @@
 	else
 	  {
 	    // No data ready for copying, so refill our buffer.
-	    System.arraycopy( seed, 0, data, SEED_SIZE, SEED_SIZE);
+	    System.arraycopy( seed, 0, data, 20, 20);
 	    byte[] digestdata = digest.digest( data );
-	    System.arraycopy( digestdata, 0, data, 0, SEED_SIZE);
+	    System.arraycopy( digestdata, 0, data, 0, 20);
 	    datapos = 0;
 	  }
       }
@@ -128,7 +117,7 @@
         new Random(0L).nextBytes(seed);
 
         byte[] digestdata = digest.digest(data);
-        System.arraycopy(digestdata, 0, data, 0, SEED_SIZE);
+        System.arraycopy(digestdata, 0, data, 0, 20);
 
         seeded = true;
       }