[pgsqlclient-checkins] pgsqlclient_10/Mono.Security/Mono.Security/Mono.Math.Prime.Generator NextPrimeFinder.cs,1.1,1.2 PrimeGeneratorBase.cs,1.1,1.2 SequentialSearchPrimeGeneratorBase.cs,1.1,1.2

[Carlos Guzm?n ?l. <car...@us...>]

Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Math.Prime.Generator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28954

Modified Files:
	NextPrimeFinder.cs PrimeGeneratorBase.cs 
	SequentialSearchPrimeGeneratorBase.cs 
Log Message:
Sync Mono.Security stuff wit Mono Beta 1 sources

Index: PrimeGeneratorBase.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Math.Prime.Generator/PrimeGeneratorBase.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrimeGeneratorBase.cs	10 Feb 2004 09:42:01 -0000	1.1
--- PrimeGeneratorBase.cs	9 May 2004 11:59:35 -0000	1.2
***************
*** 12,17 ****
  namespace Mono.Math.Prime.Generator {
  
! 	[CLSCompliant(false)]
! 	internal abstract class PrimeGeneratorBase {
  
  		public virtual ConfidenceFactor Confidence {
--- 12,21 ----
  namespace Mono.Math.Prime.Generator {
  
! #if INSIDE_CORLIB
! 	internal
! #else
! 	public
! #endif
! 	abstract class PrimeGeneratorBase {
  
  		public virtual ConfidenceFactor Confidence {
***************
*** 27,31 ****
  		public virtual Prime.PrimalityTest PrimalityTest {
  			get {
! 				return new Prime.PrimalityTest (PrimalityTests.SmallPrimeSppTest);
  			}
  		}
--- 31,35 ----
  		public virtual Prime.PrimalityTest PrimalityTest {
  			get {
! 				return new Prime.PrimalityTest (PrimalityTests.RabinMillerTest);
  			}
  		}

Index: NextPrimeFinder.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Math.Prime.Generator/NextPrimeFinder.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NextPrimeFinder.cs	10 Feb 2004 09:42:01 -0000	1.1
--- NextPrimeFinder.cs	9 May 2004 11:59:35 -0000	1.2
***************
*** 15,25 ****
  	/// Finds the next prime after a given number.
  	/// </summary>
! 	[CLSCompliant(false)]
! 	internal class NextPrimeFinder : SequentialSearchPrimeGeneratorBase {
  		protected override BigInteger GenerateSearchBase (int bits, object Context) 
  		{
! 			if (Context == null) throw new ArgumentNullException ("Context");
  			BigInteger ret = new BigInteger ((BigInteger)Context);
! 			ret.setBit (0);
  			return ret;
  		}
--- 15,32 ----
  	/// Finds the next prime after a given number.
  	/// </summary>
! #if INSIDE_CORLIB
! 	internal
! #else
! 	public
! #endif
! 	class NextPrimeFinder : SequentialSearchPrimeGeneratorBase {
! 		
  		protected override BigInteger GenerateSearchBase (int bits, object Context) 
  		{
! 			if (Context == null) 
! 				throw new ArgumentNullException ("Context");
! 
  			BigInteger ret = new BigInteger ((BigInteger)Context);
! 			ret.SetBit (0);
  			return ret;
  		}

Index: SequentialSearchPrimeGeneratorBase.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Math.Prime.Generator/SequentialSearchPrimeGeneratorBase.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SequentialSearchPrimeGeneratorBase.cs	10 Feb 2004 09:42:01 -0000	1.1
--- SequentialSearchPrimeGeneratorBase.cs	9 May 2004 11:59:35 -0000	1.2
***************
*** 13,23 ****
  namespace Mono.Math.Prime.Generator {
  
! 	[CLSCompliant(false)]
! 	internal class SequentialSearchPrimeGeneratorBase : PrimeGeneratorBase {
  
! 		protected virtual BigInteger GenerateSearchBase (int bits, object Context)
  		{
! 			BigInteger ret = BigInteger.genRandom (bits);
! 			ret.setBit (0);
  			return ret;
  		}
--- 13,27 ----
  namespace Mono.Math.Prime.Generator {
  
! #if INSIDE_CORLIB
! 	internal
! #else
! 	public
! #endif
! 	class SequentialSearchPrimeGeneratorBase : PrimeGeneratorBase {
  
! 		protected virtual BigInteger GenerateSearchBase (int bits, object context)
  		{
! 			BigInteger ret = BigInteger.GenerateRandom (bits);
! 			ret.SetBit (0);
  			return ret;
  		}
***************
*** 30,39 ****
  
  
! 		public virtual BigInteger GenerateNewPrime (int bits, object Context)
  		{
  			//
  			// STEP 1. Find a place to do a sequential search
  			//
! 			BigInteger curVal = GenerateSearchBase (bits, Context);
  
  			const uint primeProd1 = 3u* 5u * 7u * 11u * 13u * 17u * 19u * 23u * 29u;
--- 34,43 ----
  
  
! 		public virtual BigInteger GenerateNewPrime (int bits, object context)
  		{
  			//
  			// STEP 1. Find a place to do a sequential search
  			//
! 			BigInteger curVal = GenerateSearchBase (bits, context);
  
  			const uint primeProd1 = 3u* 5u * 7u * 11u * 13u * 17u * 19u * 23u * 29u;
***************
*** 73,77 ****
  				// STEP 2.3 Is the potential prime acceptable?
  				//
! 				if (!IsPrimeAcceptable (curVal, Context)) goto biNotPrime;
  
  				//
--- 77,81 ----
  				// STEP 2.3 Is the potential prime acceptable?
  				//
! 				if (!IsPrimeAcceptable (curVal, context)) goto biNotPrime;
  
  				//
***************
*** 91,95 ****
  		}
  
! 		protected virtual bool IsPrimeAcceptable (BigInteger bi, object Context)
  		{
  			return true;
--- 95,99 ----
  		}
  
! 		protected virtual bool IsPrimeAcceptable (BigInteger bi, object context)
  		{
  			return true;