2006-08-03 Raif S. Naffah <raif@swiftdsl.com.au>

       PR Classpath/23899
       * java/security/SecureRandom.java (next): Call nextBytes as per specs.

2 files changed, 7 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 03b91d3fd..fedf0ee62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-03  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	PR Classpath/23899
+	* java/security/SecureRandom.java (next): Call nextBytes as per specs.
+
 2006-08-03  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* native/jawt/Makefile.am (libjawt_la_LDFLAGS): Add
diff --git a/java/security/SecureRandom.java b/java/security/SecureRandom.java
index d403d4964..c66963e8f 100644
--- a/java/security/SecureRandom.java
+++ b/java/security/SecureRandom.java
@@ -374,14 +374,9 @@ public class SecureRandom extends Random
     if (numBits == 0)
       return 0;
 
-    byte[] tmp = new byte[numBits / 8 + (1 * (numBits % 8))];
-
-    secureRandomSpi.engineNextBytes(tmp);
-    randomBytesUsed += tmp.length;
-    counter++;
-
+    byte[] tmp = new byte[(numBits + 7) / 8];
+    this.nextBytes(tmp);
     int ret = 0;
-
     for (int i = 0; i < tmp.length; i++)
       ret |= (tmp[i] & 0xFF) << (8 * i);