diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-10-18 00:05:29 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-10-18 00:05:29 +0000 |
| commit | 8ea6262761029a1cccc0e0280ce8be198e687636 (patch) | |
| tree | 7f91c804fed22e2aa07052194ebcc4fbdc5ccf99 /libjava/java/security | |
| parent | 9c48b4d1e45a17795b4c37a359433c254f8c2d77 (diff) | |
| download | gcc-8ea6262761029a1cccc0e0280ce8be198e687636.zip gcc-8ea6262761029a1cccc0e0280ce8be198e687636.tar.gz gcc-8ea6262761029a1cccc0e0280ce8be198e687636.tar.bz2 | |
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
Diffstat (limited to 'libjava/java/security')
| -rw-r--r-- | libjava/java/security/SecureRandom.java | 28 |
1 files changed, 20 insertions, 8 deletions
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); + } } /** |