Prime.java (generateRandomPrime): Use return result from `add'.

2004-08-30  Tom Tromey  <tromey@redhat.com>

	* gnu/java/security/util/Prime.java (generateRandomPrime): Use
	return result from `add'.

From-SVN: r86787
This commit is contained in:
Tom Tromey 2004-08-30 17:29:48 +00:00 committed by Andreas Tobler
parent a23adb4d00
commit b6e9851af8
2 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2004-08-30 Tom Tromey <tromey@redhat.com>
* gnu/java/security/util/Prime.java (generateRandomPrime): Use
return result from `add'.
2004-08-30 Tom Tromey <tromey@redhat.com>
* java/rmi/server/UID.java (UID): Read `nextCount', not count.

View File

@ -1,5 +1,5 @@
/* Prime.java --- Prime number generation utilities
Copyright (C) 1999 Free Software Foundation, Inc.
Copyright (C) 1999, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -55,12 +55,12 @@ public final class Prime
BigInteger p = new BigInteger( (pmax + pmin)/2, new Random() );
if( p.compareTo( BigInteger.valueOf( 1 ).shiftLeft( pmin ) ) <= 0 )
{
p.add( BigInteger.valueOf( 1 ).shiftLeft( pmin ).subtract( p ) );
p = p.add( BigInteger.valueOf( 1 ).shiftLeft( pmin ).subtract( p ) );
}
//Step 2 - test for even
if( p.mod( BigInteger.valueOf(2) ).compareTo( BigInteger.valueOf( 0 )) == 0)
p.add( BigInteger.valueOf( 1 ) );
p = p.add( BigInteger.valueOf( 1 ) );
for(;;)
{
@ -76,7 +76,7 @@ public final class Prime
// put step 2 code here so looping code is cleaner
//Step 2 - test for even
if( p.mod( BigInteger.valueOf(2) ).compareTo( BigInteger.valueOf( 0 )) == 0)
p.add( BigInteger.valueOf( 1 ) );
p = p.add( BigInteger.valueOf( 1 ) );
continue;
}
@ -122,7 +122,7 @@ public final class Prime
//Step 4 - test for even
if( p.mod( BigInteger.valueOf(2) ).compareTo( BigInteger.valueOf( 0 )) == 0)
p.add( r );
p = p.add( r );
for(;;)
{