From 8ea6262761029a1cccc0e0280ce8be198e687636 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 18 Oct 2001 00:05:29 +0000 Subject: SHA1PRNG.java (engineNextBytes): Rewrote. * gnu/java/security/provider/SHA1PRNG.java (engineNextBytes): Rewrote. * java/security/SecureRandom.java (setSeed(long)): Don't set seed if secureRandomSpi is not initialized. From-SVN: r46327 --- libjava/java/security/SecureRandom.java | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'libjava/java/security/SecureRandom.java') diff --git a/libjava/java/security/SecureRandom.java b/libjava/java/security/SecureRandom.java index 39a3947..597d077 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); + } } /** -- cgit v1.1