Add additional tests

1 files changed, 263 insertions, 157 deletions

diff --git a/validat1.cpp b/validat1.cpp
index b38dac66..31fe71d7 100644
--- a/validat1.cpp
+++ b/validat1.cpp
@@ -70,7 +70,7 @@ bool ValidateAll(bool thorough)
 {

 	bool pass=TestSettings();

 	pass=TestOS_RNG() && pass;

-	pass=TestAutoSeeded() && pass;

+	pass=TestRandomPool() && pass;

 	pass=TestAutoSeededX917() && pass;

 	// pass=TestSecRandom() && pass;

 #if defined(CRYPTOPP_EXTENDED_VALIDATION)

@@ -459,7 +459,7 @@ bool TestOS_RNG()
 			RandomNumberGenerator& prng = *rng.get();

 			(void)prng.AlgorithmName();

 			word32 result = prng.GenerateWord32();

-			result = prng.GenerateWord32(21, 0xffffffff - 21);

+			result = prng.GenerateWord32((result & 0xff), 0xffffffff - (result & 0xff));

 			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 4);

 			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 3);

 			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 2);

@@ -509,7 +509,7 @@ bool TestOS_RNG()
 			RandomNumberGenerator& prng = *rng.get();

 			(void)prng.AlgorithmName();

 			word32 result = prng.GenerateWord32();

-			result = prng.GenerateWord32(21, 0xffffffff - 21);

+			result = prng.GenerateWord32((result & 0xff), 0xffffffff - (result & 0xff));

 			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 4);

 			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 3);

 			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 2);

@@ -534,102 +534,185 @@ bool TestOS_RNG()
 	return pass;

 }

 

-#if defined(NO_OS_DEPENDENCE) || !defined(OS_RNG_AVAILABLE)

-bool TestAutoSeeded()

+#if !defined(NO_OS_DEPENDENCE)

+bool TestRandomPool()

 {

-	return true;

-}

-bool TestAutoSeededX917()

-{

-	return true;

-}

-#else

-bool TestAutoSeeded()

-{

-	// This tests Auto-Seeding and GenerateIntoBufferedTransformation.

-	std::cout << "\nTesting AutoSeeded generator...\n\n";

+	std::cout << "\nTesting RandomPool generator...\n\n";

+	bool pass=true, fail;

+	{

+		RandomPool prng;

+		static const unsigned int ENTROPY_SIZE = 32;

 

-	AutoSeededRandomPool prng;

-	static const unsigned int ENTROPY_SIZE = 32;

-	bool generate = true, discard = true, incorporate = false, crop = false;

+		MeterFilter meter(new Redirector(TheBitBucket()));

+		RandomNumberSource test(prng, 100000, true, new Deflator(new Redirector(meter)));

 

-	MeterFilter meter(new Redirector(TheBitBucket()));

-	RandomNumberSource test(prng, 100000, true, new Deflator(new Redirector(meter)));

+		fail = false;

+		if (meter.GetTotalBytes() < 100000)

+			fail = true;

 

-	if (meter.GetTotalBytes() < 100000)

-	{

-		std::cout << "FAILED:";

-		generate = false;

-	}

-	else

-		std::cout << "passed:";

-	std::cout << "  100000 generated bytes compressed to " << meter.GetTotalBytes() << " bytes by DEFLATE\n";

+		pass &= !fail;

+		if (fail)

+			std::cout << "FAILED:";

+		else

+			std::cout << "passed:";

+		std::cout << "  100000 generated bytes compressed to " << meter.GetTotalBytes() << " bytes by DEFLATE\n";

 

-	try

-	{

-		prng.DiscardBytes(100000);

-	}

-	catch (const Exception&)

-	{

-		discard = false;

-	}

+		try

+		{

+			fail = false;

+			prng.DiscardBytes(100000);

+		}

+		catch (const Exception&)

+		{

+			fail = true;

+		}

 

-	if (!discard)

-		std::cout << "FAILED:";

-	else

-		std::cout << "passed:";

-	std::cout << "  discarded 10000 bytes" << std::endl;

+		pass &= !fail;

+		if (fail)

+			std::cout << "FAILED:";

+		else

+			std::cout << "passed:";

+		std::cout << "  discarded 10000 bytes" << std::endl;

 

-	try

-	{

-		if(prng.CanIncorporateEntropy())

+		try

 		{

-			SecByteBlock entropy(ENTROPY_SIZE);

-			GlobalRNG().GenerateBlock(entropy, entropy.SizeInBytes());

+			fail = false;

+			if(prng.CanIncorporateEntropy())

+			{

+				SecByteBlock entropy(ENTROPY_SIZE);

+				GlobalRNG().GenerateBlock(entropy, entropy.SizeInBytes());

 

-			prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

-			prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

-			prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

-			prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

+				prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

+				prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

+				prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

+				prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

+			}

+		}

+		catch (const Exception& /*ex*/)

+		{

+			fail = true;

+		}

+

+		pass &= !fail;

+		if (fail)

+			std::cout << "FAILED:";

+		else

+			std::cout << "passed:";

+		std::cout << "  IncorporateEntropy with " << 4*ENTROPY_SIZE << " bytes\n";

 

-			incorporate = true;

+		try

+		{

+			// Miscellaneous for code coverage

+			(void)prng.AlgorithmName();  // "unknown"

+			word32 result = prng.GenerateWord32();

+			result = prng.GenerateWord32((result & 0xff), 0xffffffff - (result & 0xff));

+			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 4);

+			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 3);

+			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 2);

+			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 1);

+		}

+		catch (const Exception&)

+		{

+			fail = true;

 		}

+

+		pass &= !fail;

+		if (fail)

+			std::cout << "FAILED:";

+		else

+			std::cout << "passed:";

+		std::cout << "  GenerateWord32 and Crop\n";	

 	}

-	catch (const Exception& /*ex*/)

+

+	std::cout << "\nTesting AutoSeeded RandomPool generator...\n\n";

 	{

-	}

+		AutoSeededRandomPool prng;

+		static const unsigned int ENTROPY_SIZE = 32;

 

-	if (!incorporate)

-		std::cout << "FAILED:";

-	else

-		std::cout << "passed:";

-	std::cout << "  IncorporateEntropy with " << 4*ENTROPY_SIZE << " bytes\n";

+		MeterFilter meter(new Redirector(TheBitBucket()));

+		RandomNumberSource test(prng, 100000, true, new Deflator(new Redirector(meter)));

 

-	try

-	{

-		// Miscellaneous for code coverage

-		(void)prng.AlgorithmName();

-		word32 result = prng.GenerateWord32();

-		result = prng.GenerateWord32(21, 0xffffffff - 21);

-		prng.GenerateBlock(reinterpret_cast<byte*>(&result), 4);

-		prng.GenerateBlock(reinterpret_cast<byte*>(&result), 3);

-		prng.GenerateBlock(reinterpret_cast<byte*>(&result), 2);

-		prng.GenerateBlock(reinterpret_cast<byte*>(&result), 1);

-		prng.GenerateBlock(reinterpret_cast<byte*>(&result), 0);

-		crop = true;

-	}

-	catch (const Exception&)

-	{

-		crop = false;

-	}

+		fail = false;

+		if (meter.GetTotalBytes() < 100000)

+			fail = true;

 

-	if (!crop)

-		std::cout << "FAILED:";

-	else

-		std::cout << "passed:";

-	std::cout << "  GenerateWord32 and Crop\n";

+		pass &= !fail;

+		if (fail)

+			std::cout << "FAILED:";

+		else

+			std::cout << "passed:";

+		std::cout << "  100000 generated bytes compressed to " << meter.GetTotalBytes() << " bytes by DEFLATE\n";

+

+		try

+		{

+			fail = false;

+			prng.DiscardBytes(100000);

+		}

+		catch (const Exception&)

+		{

+			fail = true;

+		}

+

+		pass &= !fail;

+		if (fail)

+			std::cout << "FAILED:";

+		else

+			std::cout << "passed:";

+		std::cout << "  discarded 10000 bytes" << std::endl;

+

+		try

+		{

+			fail = false;

+			if(prng.CanIncorporateEntropy())

+			{

+				SecByteBlock entropy(ENTROPY_SIZE);

+				GlobalRNG().GenerateBlock(entropy, entropy.SizeInBytes());

+

+				prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

+				prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

+				prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

+				prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

+			}

+		}

+		catch (const Exception& /*ex*/)

+		{

+			fail = true;

+		}

 

-	return generate && discard && incorporate && crop;

+		pass &= !fail;

+		if (fail)

+			std::cout << "FAILED:";

+		else

+			std::cout << "passed:";

+		std::cout << "  IncorporateEntropy with " << 4*ENTROPY_SIZE << " bytes\n";

+

+		try

+		{

+			// Miscellaneous for code coverage

+			fail = false;

+			(void)prng.AlgorithmName();  // "unknown"

+			word32 result = prng.GenerateWord32();

+			result = prng.GenerateWord32((result & 0xff), 0xffffffff - (result & 0xff));

+			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 4);

+			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 3);

+			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 2);

+			prng.GenerateBlock(reinterpret_cast<byte*>(&result), 1);

+		}

+		catch (const Exception&)

+		{

+			fail = true;

+		}

+

+		pass &= !fail;

+		if (fail)

+			std::cout << "FAILED:";

+		else

+			std::cout << "passed:";

+		std::cout << "  GenerateWord32 and Crop\n";	

+	}

+

+	std::cout.flush();

+	return pass;

 }

 

 bool TestAutoSeededX917()

@@ -638,31 +721,35 @@ bool TestAutoSeededX917()
 	std::cout << "\nTesting AutoSeeded X917 generator...\n\n";

 

 	AutoSeededX917RNG<AES> prng;

+	bool pass = true, fail;

 	static const unsigned int ENTROPY_SIZE = 32;

-	bool generate = true, discard = true, incorporate = false, crop = false;

 

 	MeterFilter meter(new Redirector(TheBitBucket()));

 	RandomNumberSource test(prng, 100000, true, new Deflator(new Redirector(meter)));

 

+	fail = false;

 	if (meter.GetTotalBytes() < 100000)

-	{

+		fail = true;

+

+	pass &= !fail;

+	if (fail)

 		std::cout << "FAILED:";

-		generate = false;

-	}

 	else

 		std::cout << "passed:";

 	std::cout << "  100000 generated bytes compressed to " << meter.GetTotalBytes() << " bytes by DEFLATE\n";

 

 	try

 	{

+		fail = false;

 		prng.DiscardBytes(100000);

 	}

 	catch (const Exception&)

 	{

-		discard = false;

+		fail = true;

 	}

 

-	if (!discard)

+	pass &= !fail;

+	if (fail)

 		std::cout << "FAILED:";

 	else

 		std::cout << "passed:";

@@ -670,6 +757,7 @@ bool TestAutoSeededX917()
 

 	try

 	{

+		fail = false;

 		if(prng.CanIncorporateEntropy())

 		{

 			SecByteBlock entropy(ENTROPY_SIZE);

@@ -679,15 +767,15 @@ bool TestAutoSeededX917()
 			prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

 			prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

 			prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

-

-			incorporate = true;

 		}

 	}

 	catch (const Exception& /*ex*/)

 	{

+		fail = true;

 	}

 

-	if (!incorporate)

+	pass &= !fail;

+	if (fail)

 		std::cout << "FAILED:";

 	else

 		std::cout << "passed:";

@@ -696,28 +784,29 @@ bool TestAutoSeededX917()
 	try

 	{

 		// Miscellaneous for code coverage

-		(void)prng.AlgorithmName();

+		fail = false;

+		(void)prng.AlgorithmName();  // "unknown"

 		word32 result = prng.GenerateWord32();

-		result = prng.GenerateWord32(21, 0xffffffff - 21);

+		result = prng.GenerateWord32((result & 0xff), 0xffffffff - (result & 0xff));

 		prng.GenerateBlock(reinterpret_cast<byte*>(&result), 4);

 		prng.GenerateBlock(reinterpret_cast<byte*>(&result), 3);

 		prng.GenerateBlock(reinterpret_cast<byte*>(&result), 2);

 		prng.GenerateBlock(reinterpret_cast<byte*>(&result), 1);

-		prng.GenerateBlock(reinterpret_cast<byte*>(&result), 0);

-		crop = true;

 	}

 	catch (const Exception&)

 	{

-		crop = false;

+		fail = true;

 	}

 

-	if (!crop)

+	pass &= !fail;

+	if (fail)

 		std::cout << "FAILED:";

 	else

 		std::cout << "passed:";

-	std::cout << "  GenerateWord32 and Crop\n";

+	std::cout << "  GenerateWord32 and Crop\n";	

 

-	return generate && discard && incorporate && crop;

+	std::cout.flush();

+	return pass;

 }

 #endif // NO_OS_DEPENDENCE

 

@@ -727,7 +816,7 @@ bool TestMersenne()
 	std::cout << "\nTesting Mersenne Twister...\n\n";

 

 	static const unsigned int ENTROPY_SIZE = 32;

-	bool equal = true, generate = true, discard = true, incorporate = false, crop = false;

+	bool pass = true, fail = false;

 

 	// First 10; http://create.stephan-brumme.com/mersenne-twister/

 	word32 result[10], expected[10] = {0xD091BB5C, 0x22AE9EF6,

@@ -736,41 +825,41 @@ bool TestMersenne()
 

 	MT19937ar prng;

 	prng.GenerateBlock(reinterpret_cast<byte*>(result), sizeof(result));

-	equal = (0 == ::memcmp(result, expected, sizeof(expected)));

+	fail = (0 != ::memcmp(result, expected, sizeof(expected)));

 

-	if (equal)

-	{

-		std::cout << "passed:";

-	}

-	else

-	{

+	pass &= !fail;

+	if (fail)

 		std::cout << "FAILED:";

-		equal = false;

-	}

+	else

+		std::cout << "passed:";

 	std::cout << "  Expected sequence from MT19937ar (2002 version)\n";

 

 	MeterFilter meter(new Redirector(TheBitBucket()));

 	RandomNumberSource test(prng, 100000, true, new Deflator(new Redirector(meter)));

 

+	fail = false;

 	if (meter.GetTotalBytes() < 100000)

-	{

+		fail = true;

+

+	pass &= !fail;

+	if (fail)

 		std::cout << "FAILED:";

-		generate = false;

-	}

 	else

 		std::cout << "passed:";

 	std::cout << "  100000 generated bytes compressed to " << meter.GetTotalBytes() << " bytes by DEFLATE\n";

 

 	try

 	{

+		fail = false;

 		prng.DiscardBytes(100000);

 	}

 	catch (const Exception&)

 	{

-		discard = false;

+		fail = true;

 	}

 

-	if (!discard)

+	pass &= !fail;

+	if (fail)

 		std::cout << "FAILED:";

 	else

 		std::cout << "passed:";

@@ -778,6 +867,7 @@ bool TestMersenne()
 

 	try

 	{

+		fail = false;

 		if(prng.CanIncorporateEntropy())

 		{

 			SecByteBlock entropy(ENTROPY_SIZE);

@@ -787,15 +877,15 @@ bool TestMersenne()
 			prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

 			prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

 			prng.IncorporateEntropy(entropy, entropy.SizeInBytes());

-

-			incorporate = true;

 		}

 	}

 	catch (const Exception& /*ex*/)

 	{

+		fail = true;

 	}

 

-	if (!incorporate)

+	pass &= !fail;

+	if (fail)

 		std::cout << "FAILED:";

 	else

 		std::cout << "passed:";

@@ -805,27 +895,29 @@ bool TestMersenne()
 	{

 		// Miscellaneous for code coverage

 		(void)prng.AlgorithmName();

-		result[0] = prng.GenerateWord32();

-		result[0] = prng.GenerateWord32(21, 0xffffffff - 21);

+		word32 temp = prng.GenerateWord32();

+		temp = prng.GenerateWord32((temp & 0xff), 0xffffffff - (temp & 0xff));

 		prng.GenerateBlock(reinterpret_cast<byte*>(&result[0]), 4);

 		prng.GenerateBlock(reinterpret_cast<byte*>(&result[0]), 3);

 		prng.GenerateBlock(reinterpret_cast<byte*>(&result[0]), 2);

 		prng.GenerateBlock(reinterpret_cast<byte*>(&result[0]), 1);

 		prng.GenerateBlock(reinterpret_cast<byte*>(&result[0]), 0);

-		crop = true;

+		fail = false;

 	}

 	catch (const Exception&)

 	{

-		crop = false;

+		fail = true;

 	}

 

-	if (!crop)

+	pass &= !fail;

+	if (fail)

 		std::cout << "FAILED:";

 	else

 		std::cout << "passed:";

 	std::cout << "  GenerateWord32 and Crop\n";

 

-	return equal && generate && discard && incorporate && crop;

+	std::cout.flush();

+	return pass;

 }

 #endif

 

@@ -834,7 +926,7 @@ bool TestRDRAND()
 {

 	std::cout << "\nTesting RDRAND generator...\n\n";

 

-	bool entropy = true, compress = true, discard = true, crop = true;

+	bool pass = true, fail = false;

 	member_ptr<RandomNumberGenerator> rng;

 

 	try {rng.reset(new RDRAND);}

@@ -858,37 +950,42 @@ bool TestRDRAND()
 		CRYPTOPP_ASSERT(0 == maurer.BytesNeeded());

 		const double mv = maurer.GetTestValue();

 		if (mv < 0.98f)

-		{

-			std::cout << "FAILED:";

-			entropy = false;

-		}

-		else

-			std::cout << "passed:";

+			fail = true;

 

 		// Coverity finding, also see http://stackoverflow.com/a/34509163/608639.

 		StreamState ss(std::cout);

 		std::cout << std::setiosflags(std::ios::fixed) << std::setprecision(6);

+

+		pass &= !fail;

+		if (fail)

+			std::cout << "FAILED:";

+		else

+			std::cout << "passed:";

 		std::cout << "  Maurer Randomness Test returned value " << mv << "\n";

 

+		fail = false;

 		if (meter.GetTotalBytes() < SIZE)

-		{

+			fail = true;

+

+		pass &= !fail;

+		if (fail)

 			std::cout << "FAILED:";

-			compress = false;

-		}

 		else

 			std::cout << "passed:";

 		std::cout << "  " << SIZE << " generated bytes compressed to " << meter.GetTotalBytes() << " bytes by DEFLATE\n";

 

 		try

 		{

+			fail = false;

 			rdrand.DiscardBytes(SIZE);

 		}

 		catch (const Exception&)

 		{

-			discard = false;

+			fail = true;

 		}

 

-		if (!discard)

+		pass &= !fail;

+		if (fail)

 			std::cout << "FAILED:";

 		else

 			std::cout << "passed:";

@@ -902,19 +999,20 @@ bool TestRDRAND()
 			rdrand.IncorporateEntropy(NULLPTR, 0);

 

 			word32 result = rdrand.GenerateWord32();

-			result = rdrand.GenerateWord32(21, 0xffffffff - 21);

+			result = rdrand.GenerateWord32((result & 0xff), 0xffffffff - (result & 0xff));

 			rdrand.GenerateBlock(reinterpret_cast<byte*>(&result), 4);

 			rdrand.GenerateBlock(reinterpret_cast<byte*>(&result), 3);

 			rdrand.GenerateBlock(reinterpret_cast<byte*>(&result), 2);

 			rdrand.GenerateBlock(reinterpret_cast<byte*>(&result), 1);

-			crop = true;

+			fail = false;

 		}

 		catch (const Exception&)

 		{

-			crop = false;

+			fail = true;

 		}

 

-		if (!crop)

+		pass &= !fail;

+		if (fail)

 			std::cout << "FAILED:";

 		else

 			std::cout << "passed:";

@@ -923,7 +1021,8 @@ bool TestRDRAND()
 	else

 		std::cout << "RDRAND generator not available, skipping test.\n";

 

-	return entropy && compress && discard && crop;

+	std::cout.flush();

+	return pass;

 }

 #endif

 

@@ -932,7 +1031,7 @@ bool TestRDSEED()
 {

 	std::cout << "\nTesting RDSEED generator...\n\n";

 

-	bool entropy = true, compress = true, discard = true, crop = true;

+	bool pass = true, fail = false;

 	member_ptr<RandomNumberGenerator> rng;

 

 	try {rng.reset(new RDSEED);}

@@ -956,37 +1055,42 @@ bool TestRDSEED()
 		CRYPTOPP_ASSERT(0 == maurer.BytesNeeded());

 		const double mv = maurer.GetTestValue();

 		if (mv < 0.98f)

-		{

-			std::cout << "FAILED:";

-			entropy = false;

-		}

-		else

-			std::cout << "passed:";

+			fail = true;

 

 		// Coverity finding, also see http://stackoverflow.com/a/34509163/608639.

 		StreamState ss(std::cout);

 		std::cout << std::setiosflags(std::ios::fixed) << std::setprecision(6);

+

+		pass &= !fail;

+		if (fail)

+			std::cout << "FAILED:";

+		else

+			std::cout << "passed:";

 		std::cout << "  Maurer Randomness Test returned value " << mv << "\n";

 

+		fail = false;

 		if (meter.GetTotalBytes() < SIZE)

-		{

+			fail = true;

+

+		pass &= !fail;

+		if (fail)

 			std::cout << "FAILED:";

-			compress = false;

-		}

 		else

 			std::cout << "passed:";

 		std::cout << "  " << SIZE << " generated bytes compressed to " << meter.GetTotalBytes() << " bytes by DEFLATE\n";

 

 		try

 		{

+			fail = false;

 			rdseed.DiscardBytes(SIZE);

 		}

 		catch (const Exception&)

 		{

-			discard = false;

+			fail = true;

 		}

 

-		if (!discard)

+		pass &= !fail;

+		if (fail)

 			std::cout << "FAILED:";

 		else

 			std::cout << "passed:";

@@ -1000,19 +1104,20 @@ bool TestRDSEED()
 			rdseed.IncorporateEntropy(NULLPTR, 0);

 

 			word32 result = rdseed.GenerateWord32();

-			result = rdseed.GenerateWord32(21, 0xffffffff - 21);

+			result = rdseed.GenerateWord32((result & 0xff), 0xffffffff - (result & 0xff));

 			rdseed.GenerateBlock(reinterpret_cast<byte*>(&result), 4);

 			rdseed.GenerateBlock(reinterpret_cast<byte*>(&result), 3);

 			rdseed.GenerateBlock(reinterpret_cast<byte*>(&result), 2);

 			rdseed.GenerateBlock(reinterpret_cast<byte*>(&result), 1);

-			crop = true;

+			fail = false;

 		}

 		catch (const Exception&)

 		{

-			crop = false;

+			fail = true;

 		}

 

-		if (!crop)

+		pass &= !fail;

+		if (fail)

 			std::cout << "FAILED:";

 		else

 			std::cout << "passed:";

@@ -1021,7 +1126,8 @@ bool TestRDSEED()
 	else

 		std::cout << "RDSEED generator not available, skipping test.\n";

 

-	return entropy && compress && discard && crop;

+	std::cout.flush();

+	return pass;

 }

 #endif