* gnu/java/security/provider/SHA1PRNG.java (engineNextBytes):

	Rewrote.
	* java/security/SecureRandom.java (setSeed(long)): Don't set seed
	if secureRandomSpi is not initialized.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46327 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 20 insertions, 8 deletions

diff --git a/libjava/java/security/SecureRandom.java b/libjava/java/security/SecureRandom.java
index 39a39474fd5..597d077993b 100644
--- a/libjava/java/security/SecureRandom.java
+++ b/libjava/java/security/SecureRandom.java
@@ -1,5 +1,5 @@
 /* SecureRandom.java --- Secure Random class implmentation
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -52,7 +52,7 @@ public class SecureRandom extends Random
      new SecureRandom by instantating the first SecureRandom 
      algorithm in the default security provier. 
 
-     It is not seeded and should be seeded using setseed or else
+     It is not seeded and should be seeded using setSeed or else
      on the first call to getnextBytes it will force a seed.
 
      It is maintained for backwards compatability and programs
@@ -267,12 +267,24 @@ public class SecureRandom extends Random
    */
   public void setSeed(long seed)
   {
-    byte tmp[] = { (byte) (0xff & (seed >> 56)), (byte) (0xff & (seed >> 48)),
-      (byte) (0xff & (seed >> 40)), (byte) (0xff & (seed >> 32)),
-      (byte) (0xff & (seed >> 24)), (byte) (0xff & (seed >> 16)),
-      (byte) (0xff & (seed >> 8)), (byte) (0xff & seed)
-    };
-    secureRandomSpi.engineSetSeed(tmp);
+    // This particular setSeed will be called by Random.Random(), via
+    // our own constructor, before secureRandomSpi is initialized.  In
+    // this case we can't call a method on secureRandomSpi, and we
+    // definitely don't want to throw a NullPointerException.
+    // Therefore we test.
+    if (secureRandomSpi != null)
+      {
+        byte tmp[] = { (byte) (0xff & (seed >> 56)),
+		       (byte) (0xff & (seed >> 48)),
+		       (byte) (0xff & (seed >> 40)),
+		       (byte) (0xff & (seed >> 32)),
+		       (byte) (0xff & (seed >> 24)),
+		       (byte) (0xff & (seed >> 16)),
+		       (byte) (0xff & (seed >> 8)),
+		       (byte) (0xff & seed)
+	};
+	secureRandomSpi.engineSetSeed(tmp);
+      }
   }
 
   /**