FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SHA1PRNG.java (engineNextBytes): Rewrote.

Browse source 
* 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
This commit is contained in:
Tom Tromey 2001-10-18 00:05:29 +00:00 • committed by Tom Tromey
parent 9c48b4d1e4
commit 8ea6262761
3 changed files with 44 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -1,5 +1,10 @@
2001-10-17 Tom Tromey <tromey@redhat.com>
* gnu/java/security/provider/SHA1PRNG.java (engineNextBytes):
Rewrote.
* java/security/SecureRandom.java (setSeed(long)): Don't set seed
if secureRandomSpi is not initialized.
* Makefile.in: Rebuilt.
* Makefile.am (secdir): New macro.
(install-data-local): Install new data files.

31
libjava/gnu/java/security/provider/SHA1PRNG.java
View file

@ -1,5 +1,5 @@
/* SHA1PRNG.java --- Secure Random SPI SHA1PRNG
Copyright (C) 1999 Free Software Foundation, Inc.
Copyright (C) 1999, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -73,29 +73,26 @@ public class SHA1PRNG extends SecureRandomSpi implements Serializable
public void engineNextBytes(byte[] bytes)
{
int loc = 0;
while (loc < bytes.length)
{
int copy = Math.min (bytes.length - loc, 20 - datapos);
if( bytes.length < (20 - datapos) ) {
System.arraycopy( data, datapos, bytes, 0, bytes.length);
datapos += bytes.length;
return;
if (copy > 0)
{
System.arraycopy (data, datapos, bytes, loc, copy);
datapos += copy;
loc += copy;
}
int i, blen = bytes.length, bpos = 0;
byte digestdata[];
while( bpos < blen ) {
i = 20 - datapos;
System.arraycopy( data, datapos, bytes, bpos, i);
bpos += i;
datapos += i;
if( datapos >= 20) {
//System.out.println( (0 + 20) + "\n" + (20 + 20) );
else
{
// No data ready for copying, so refill our buffer.
System.arraycopy( seed, 0, data, 20, 20);
digestdata = digest.digest( data );
byte[] digestdata = digest.digest( data );
System.arraycopy( digestdata, 0, data, 0, 20);
datapos = 0;
}
}
}
public byte[] engineGenerateSeed(int numBytes)

24
libjava/java/security/SecureRandom.java
View file

@ -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,13 +267,25 @@ 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)
// 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);
}
}
/**
Generates a user specified number of bytes. This function