Merge branch 'mbedtls'

Replace Crypto++ 5.6.2 with Mbed TLS 3.6.0

Newer compilers are starting to show the age of the crypto library we've
been using, as it is sometimes a pain to recompile compass lately.  So,
the tracked version of Crypto++ was at least due for an upgrade.

However, I plan to soon begin reimplementing compass in C.  So, I'm
taking this opportunity to first just migrate the cryptography library
to a newer C alternative.  This branch does so, and integrates its use
into the current C++ version of compass.

* mbedtls:
  Remove unnecessary exception handler catch block
  Refactor random password generation to use mbedtls entropy source
  Refactor SHA256 function to use mbedtls
  Refactor AES functions to use mbedtls
  Add Mbedtls library
  Remove Crypto++ library

1 files changed, 0 insertions, 757 deletions

diff --git a/cryptopp562/datatest.cpp b/cryptopp562/datatest.cpp
deleted file mode 100644
index 7a1a9cf..0000000
--- a/cryptopp562/datatest.cpp
+++ /dev/null
@@ -1,757 +0,0 @@
-#include "factory.h"
-#include "integer.h"
-#include "filters.h"
-#include "hex.h"
-#include "randpool.h"
-#include "files.h"
-#include "trunhash.h"
-#include "queue.h"
-#include "validate.h"
-#include <iostream>
-#include <memory>
-
-USING_NAMESPACE(CryptoPP)
-USING_NAMESPACE(std)
-
-typedef std::map<std::string, std::string> TestData;
-static bool s_thorough;
-
-class TestFailure : public Exception
-{
-public:
-	TestFailure() : Exception(OTHER_ERROR, "Validation test failed") {}
-};
-
-static const TestData *s_currentTestData = NULL;
-
-static void OutputTestData(const TestData &v)
-{
-	for (TestData::const_iterator i = v.begin(); i != v.end(); ++i)
-	{
-		cerr << i->first << ": " << i->second << endl;
-	}
-}
-
-static void SignalTestFailure()
-{
-	OutputTestData(*s_currentTestData);
-	throw TestFailure();
-}
-
-static void SignalTestError()
-{
-	OutputTestData(*s_currentTestData);
-	throw Exception(Exception::OTHER_ERROR, "Unexpected error during validation test");
-}
-
-bool DataExists(const TestData &data, const char *name)
-{
-	TestData::const_iterator i = data.find(name);
-	return (i != data.end());
-}
-
-const std::string & GetRequiredDatum(const TestData &data, const char *name)
-{
-	TestData::const_iterator i = data.find(name);
-	if (i == data.end())
-		SignalTestError();
-	return i->second;
-}
-
-void RandomizedTransfer(BufferedTransformation &source, BufferedTransformation &target, bool finish, const std::string &channel=DEFAULT_CHANNEL)
-{
-	while (source.MaxRetrievable() > (finish ? 0 : 4096))
-	{
-		byte buf[4096+64];
-		size_t start = GlobalRNG().GenerateWord32(0, 63);
-		size_t len = GlobalRNG().GenerateWord32(1, UnsignedMin(4096U, 3*source.MaxRetrievable()/2));
-		len = source.Get(buf+start, len);
-		target.ChannelPut(channel, buf+start, len);
-	}
-}
-
-void PutDecodedDatumInto(const TestData &data, const char *name, BufferedTransformation &target)
-{
-	std::string s1 = GetRequiredDatum(data, name), s2;
-	ByteQueue q;
-
-	while (!s1.empty())
-	{
-		while (s1[0] == ' ')
-		{
-			s1 = s1.substr(1);
-			if (s1.empty())
-				goto end;	// avoid invalid read if s1 is empty
-		}
-
-		int repeat = 1;
-		if (s1[0] == 'r')
-		{
-			repeat = atoi(s1.c_str()+1);
-			s1 = s1.substr(s1.find(' ')+1);
-		}
-		
-		s2 = ""; // MSVC 6 doesn't have clear();
-
-		if (s1[0] == '\"')
-		{
-			s2 = s1.substr(1, s1.find('\"', 1)-1);
-			s1 = s1.substr(s2.length() + 2);
-		}
-		else if (s1.substr(0, 2) == "0x")
-		{
-			StringSource(s1.substr(2, s1.find(' ')), true, new HexDecoder(new StringSink(s2)));
-			s1 = s1.substr(STDMIN(s1.find(' '), s1.length()));
-		}
-		else
-		{
-			StringSource(s1.substr(0, s1.find(' ')), true, new HexDecoder(new StringSink(s2)));
-			s1 = s1.substr(STDMIN(s1.find(' '), s1.length()));
-		}
-
-		while (repeat--)
-		{
-			q.Put((const byte *)s2.data(), s2.size());
-			RandomizedTransfer(q, target, false);
-		}
-	}
-
-end:
-	RandomizedTransfer(q, target, true);
-}
-
-std::string GetDecodedDatum(const TestData &data, const char *name)
-{
-	std::string s;
-	PutDecodedDatumInto(data, name, StringSink(s).Ref());
-	return s;
-}
-
-std::string GetOptionalDecodedDatum(const TestData &data, const char *name)
-{
-	std::string s;
-	if (DataExists(data, name))
-		PutDecodedDatumInto(data, name, StringSink(s).Ref());
-	return s;
-}
-
-class TestDataNameValuePairs : public NameValuePairs
-{
-public:
-	TestDataNameValuePairs(const TestData &data) : m_data(data) {}
-
-	virtual bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
-	{
-		TestData::const_iterator i = m_data.find(name);
-		if (i == m_data.end())
-		{
-			if (std::string(name) == Name::DigestSize() && valueType == typeid(int))
-			{
-				i = m_data.find("MAC");
-				if (i == m_data.end())
-					i = m_data.find("Digest");
-				if (i == m_data.end())
-					return false;
-
-				m_temp.resize(0);
-				PutDecodedDatumInto(m_data, i->first.c_str(), StringSink(m_temp).Ref());
-				*reinterpret_cast<int *>(pValue) = (int)m_temp.size();
-				return true;
-			}
-			else
-				return false;
-		}
-		
-		const std::string &value = i->second;
-		
-		if (valueType == typeid(int))
-			*reinterpret_cast<int *>(pValue) = atoi(value.c_str());
-		else if (valueType == typeid(Integer))
-			*reinterpret_cast<Integer *>(pValue) = Integer((std::string(value) + "h").c_str());
-		else if (valueType == typeid(ConstByteArrayParameter))
-		{
-			m_temp.resize(0);
-			PutDecodedDatumInto(m_data, name, StringSink(m_temp).Ref());
-			reinterpret_cast<ConstByteArrayParameter *>(pValue)->Assign((const byte *)m_temp.data(), m_temp.size(), false);
-		}
-		else
-			throw ValueTypeMismatch(name, typeid(std::string), valueType);
-
-		return true;
-	}
-
-private:
-	const TestData &m_data;
-	mutable std::string m_temp;
-};
-
-void TestKeyPairValidAndConsistent(CryptoMaterial &pub, const CryptoMaterial &priv)
-{
-	if (!pub.Validate(GlobalRNG(), 2+s_thorough))
-		SignalTestFailure();
-	if (!priv.Validate(GlobalRNG(), 2+s_thorough))
-		SignalTestFailure();
-
-	ByteQueue bq1, bq2;
-	pub.Save(bq1);
-	pub.AssignFrom(priv);
-	pub.Save(bq2);
-	if (bq1 != bq2)
-		SignalTestFailure();
-}
-
-void TestSignatureScheme(TestData &v)
-{
-	std::string name = GetRequiredDatum(v, "Name");
-	std::string test = GetRequiredDatum(v, "Test");
-
-	std::auto_ptr<PK_Signer> signer(ObjectFactoryRegistry<PK_Signer>::Registry().CreateObject(name.c_str()));
-	std::auto_ptr<PK_Verifier> verifier(ObjectFactoryRegistry<PK_Verifier>::Registry().CreateObject(name.c_str()));
-
-	TestDataNameValuePairs pairs(v);
-
-	if (test == "GenerateKey")
-	{
-		signer->AccessPrivateKey().GenerateRandom(GlobalRNG(), pairs);
-		verifier->AccessPublicKey().AssignFrom(signer->AccessPrivateKey());
-	}
-	else
-	{
-		std::string keyFormat = GetRequiredDatum(v, "KeyFormat");
-
-		if (keyFormat == "DER")
-			verifier->AccessMaterial().Load(StringStore(GetDecodedDatum(v, "PublicKey")).Ref());
-		else if (keyFormat == "Component")
-			verifier->AccessMaterial().AssignFrom(pairs);
-
-		if (test == "Verify" || test == "NotVerify")
-		{
-			VerifierFilter verifierFilter(*verifier, NULL, VerifierFilter::SIGNATURE_AT_BEGIN);
-			PutDecodedDatumInto(v, "Signature", verifierFilter);
-			PutDecodedDatumInto(v, "Message", verifierFilter);
-			verifierFilter.MessageEnd();
-			if (verifierFilter.GetLastResult() == (test == "NotVerify"))
-				SignalTestFailure();
-			return;
-		}
-		else if (test == "PublicKeyValid")
-		{
-			if (!verifier->GetMaterial().Validate(GlobalRNG(), 3))
-				SignalTestFailure();
-			return;
-		}
-
-		if (keyFormat == "DER")
-			signer->AccessMaterial().Load(StringStore(GetDecodedDatum(v, "PrivateKey")).Ref());
-		else if (keyFormat == "Component")
-			signer->AccessMaterial().AssignFrom(pairs);
-	}
-
-	if (test == "GenerateKey" || test == "KeyPairValidAndConsistent")
-	{
-		TestKeyPairValidAndConsistent(verifier->AccessMaterial(), signer->GetMaterial());
-		VerifierFilter verifierFilter(*verifier, NULL, VerifierFilter::THROW_EXCEPTION);
-		verifierFilter.Put((const byte *)"abc", 3);
-		StringSource ss("abc", true, new SignerFilter(GlobalRNG(), *signer, new Redirector(verifierFilter)));
-	}
-	else if (test == "Sign")
-	{
-		SignerFilter f(GlobalRNG(), *signer, new HexEncoder(new FileSink(cout)));
-		StringSource ss(GetDecodedDatum(v, "Message"), true, new Redirector(f));
-		SignalTestFailure();
-	}
-	else if (test == "DeterministicSign")
-	{
-		SignalTestError();
-		assert(false);	// TODO: implement
-	}
-	else if (test == "RandomSign")
-	{
-		SignalTestError();
-		assert(false);	// TODO: implement
-	}
-	else
-	{
-		SignalTestError();
-		assert(false);
-	}
-}
-
-void TestAsymmetricCipher(TestData &v)
-{
-	std::string name = GetRequiredDatum(v, "Name");
-	std::string test = GetRequiredDatum(v, "Test");
-
-	std::auto_ptr<PK_Encryptor> encryptor(ObjectFactoryRegistry<PK_Encryptor>::Registry().CreateObject(name.c_str()));
-	std::auto_ptr<PK_Decryptor> decryptor(ObjectFactoryRegistry<PK_Decryptor>::Registry().CreateObject(name.c_str()));
-
-	std::string keyFormat = GetRequiredDatum(v, "KeyFormat");
-
-	if (keyFormat == "DER")
-	{
-		decryptor->AccessMaterial().Load(StringStore(GetDecodedDatum(v, "PrivateKey")).Ref());
-		encryptor->AccessMaterial().Load(StringStore(GetDecodedDatum(v, "PublicKey")).Ref());
-	}
-	else if (keyFormat == "Component")
-	{
-		TestDataNameValuePairs pairs(v);
-		decryptor->AccessMaterial().AssignFrom(pairs);
-		encryptor->AccessMaterial().AssignFrom(pairs);
-	}
-
-	if (test == "DecryptMatch")
-	{
-		std::string decrypted, expected = GetDecodedDatum(v, "Plaintext");
-		StringSource ss(GetDecodedDatum(v, "Ciphertext"), true, new PK_DecryptorFilter(GlobalRNG(), *decryptor, new StringSink(decrypted)));
-		if (decrypted != expected)
-			SignalTestFailure();
-	}
-	else if (test == "KeyPairValidAndConsistent")
-	{
-		TestKeyPairValidAndConsistent(encryptor->AccessMaterial(), decryptor->GetMaterial());
-	}
-	else
-	{
-		SignalTestError();
-		assert(false);
-	}
-}
-
-void TestSymmetricCipher(TestData &v, const NameValuePairs &overrideParameters)
-{
-	std::string name = GetRequiredDatum(v, "Name");
-	std::string test = GetRequiredDatum(v, "Test");
-
-	std::string key = GetDecodedDatum(v, "Key");
-	std::string plaintext = GetDecodedDatum(v, "Plaintext");
-
-	TestDataNameValuePairs testDataPairs(v);
-	CombinedNameValuePairs pairs(overrideParameters, testDataPairs);
-
-	if (test == "Encrypt" || test == "EncryptXorDigest" || test == "Resync" || test == "EncryptionMCT" || test == "DecryptionMCT")
-	{
-		static member_ptr<SymmetricCipher> encryptor, decryptor;
-		static std::string lastName;
-
-		if (name != lastName)
-		{
-			encryptor.reset(ObjectFactoryRegistry<SymmetricCipher, ENCRYPTION>::Registry().CreateObject(name.c_str()));
-			decryptor.reset(ObjectFactoryRegistry<SymmetricCipher, DECRYPTION>::Registry().CreateObject(name.c_str()));
-			lastName = name;
-		}
-
-		ConstByteArrayParameter iv;
-		if (pairs.GetValue(Name::IV(), iv) && iv.size() != encryptor->IVSize())
-			SignalTestFailure();
-
-		if (test == "Resync")
-		{
-			encryptor->Resynchronize(iv.begin(), (int)iv.size());
-			decryptor->Resynchronize(iv.begin(), (int)iv.size());
-		}
-		else
-		{
-			encryptor->SetKey((const byte *)key.data(), key.size(), pairs);
-			decryptor->SetKey((const byte *)key.data(), key.size(), pairs);
-		}
-
-		int seek = pairs.GetIntValueWithDefault("Seek", 0);
-		if (seek)
-		{
-			encryptor->Seek(seek);
-			decryptor->Seek(seek);
-		}
-
-		std::string encrypted, xorDigest, ciphertext, ciphertextXorDigest;
-		if (test == "EncryptionMCT" || test == "DecryptionMCT")
-		{
-			SymmetricCipher *cipher = encryptor.get();
-			SecByteBlock buf((byte *)plaintext.data(), plaintext.size()), keybuf((byte *)key.data(), key.size());
-
-			if (test == "DecryptionMCT")
-			{
-				cipher = decryptor.get();
-				ciphertext = GetDecodedDatum(v, "Ciphertext");
-				buf.Assign((byte *)ciphertext.data(), ciphertext.size());
-			}
-
-			for (int i=0; i<400; i++)
-			{
-				encrypted.reserve(10000 * plaintext.size());
-				for (int j=0; j<10000; j++)
-				{
-					cipher->ProcessString(buf.begin(), buf.size());
-					encrypted.append((char *)buf.begin(), buf.size());
-				}
-
-				encrypted.erase(0, encrypted.size() - keybuf.size());
-				xorbuf(keybuf.begin(), (const byte *)encrypted.data(), keybuf.size());
-				cipher->SetKey(keybuf, keybuf.size());
-			}
-			encrypted.assign((char *)buf.begin(), buf.size());
-			ciphertext = GetDecodedDatum(v, test == "EncryptionMCT" ? "Ciphertext" : "Plaintext");
-			if (encrypted != ciphertext)
-			{
-				std::cout << "incorrectly encrypted: ";
-				StringSource xx(encrypted, false, new HexEncoder(new FileSink(std::cout)));
-				xx.Pump(256); xx.Flush(false);
-				std::cout << "\n";
-				SignalTestFailure();
-			}
-			return;
-		}
-
-		StreamTransformationFilter encFilter(*encryptor, new StringSink(encrypted), StreamTransformationFilter::NO_PADDING);
-		RandomizedTransfer(StringStore(plaintext).Ref(), encFilter, true);
-		encFilter.MessageEnd();
-		/*{
-			std::string z;
-			encryptor->Seek(seek);
-			StringSource ss(plaintext, false, new StreamTransformationFilter(*encryptor, new StringSink(z), StreamTransformationFilter::NO_PADDING));
-			while (ss.Pump(64)) {}
-			ss.PumpAll();
-			for (int i=0; i<z.length(); i++)
-				assert(encrypted[i] == z[i]);
-		}*/
-		if (test != "EncryptXorDigest")
-			ciphertext = GetDecodedDatum(v, "Ciphertext");
-		else
-		{
-			ciphertextXorDigest = GetDecodedDatum(v, "CiphertextXorDigest");
-			xorDigest.append(encrypted, 0, 64);
-			for (size_t i=64; i<encrypted.size(); i++)
-				xorDigest[i%64] ^= encrypted[i];
-		}
-		if (test != "EncryptXorDigest" ? encrypted != ciphertext : xorDigest != ciphertextXorDigest)
-		{
-			std::cout << "incorrectly encrypted: ";
-			StringSource xx(encrypted, false, new HexEncoder(new FileSink(std::cout)));
-			xx.Pump(2048); xx.Flush(false);
-			std::cout << "\n";
-			SignalTestFailure();
-		}
-		std::string decrypted;
-		StreamTransformationFilter decFilter(*decryptor, new StringSink(decrypted), StreamTransformationFilter::NO_PADDING);
-		RandomizedTransfer(StringStore(encrypted).Ref(), decFilter, true);
-		decFilter.MessageEnd();
-		if (decrypted != plaintext)
-		{
-			std::cout << "incorrectly decrypted: ";
-			StringSource xx(decrypted, false, new HexEncoder(new FileSink(std::cout)));
-			xx.Pump(256); xx.Flush(false);
-			std::cout << "\n";
-			SignalTestFailure();
-		}
-	}
-	else
-	{
-		std::cout << "unexpected test name\n";
-		SignalTestError();
-	}
-}
-
-void TestAuthenticatedSymmetricCipher(TestData &v, const NameValuePairs &overrideParameters)
-{
-	std::string type = GetRequiredDatum(v, "AlgorithmType");
-	std::string name = GetRequiredDatum(v, "Name");
-	std::string test = GetRequiredDatum(v, "Test");
-	std::string key = GetDecodedDatum(v, "Key");
-
-	std::string plaintext = GetOptionalDecodedDatum(v, "Plaintext");
-	std::string ciphertext = GetOptionalDecodedDatum(v, "Ciphertext");
-	std::string header = GetOptionalDecodedDatum(v, "Header");
-	std::string footer = GetOptionalDecodedDatum(v, "Footer");
-	std::string mac = GetOptionalDecodedDatum(v, "MAC");
-
-	TestDataNameValuePairs testDataPairs(v);
-	CombinedNameValuePairs pairs(overrideParameters, testDataPairs);
-
-	if (test == "Encrypt" || test == "EncryptXorDigest" || test == "NotVerify")
-	{
-		member_ptr<AuthenticatedSymmetricCipher> asc1, asc2;
-		asc1.reset(ObjectFactoryRegistry<AuthenticatedSymmetricCipher, ENCRYPTION>::Registry().CreateObject(name.c_str()));
-		asc2.reset(ObjectFactoryRegistry<AuthenticatedSymmetricCipher, DECRYPTION>::Registry().CreateObject(name.c_str()));
-		asc1->SetKey((const byte *)key.data(), key.size(), pairs);
-		asc2->SetKey((const byte *)key.data(), key.size(), pairs);
-
-		std::string encrypted, decrypted;
-		AuthenticatedEncryptionFilter ef(*asc1, new StringSink(encrypted));
-		bool macAtBegin = !mac.empty() && !GlobalRNG().GenerateBit();	// test both ways randomly
-		AuthenticatedDecryptionFilter df(*asc2, new StringSink(decrypted), macAtBegin ? AuthenticatedDecryptionFilter::MAC_AT_BEGIN : 0);
-
-		if (asc1->NeedsPrespecifiedDataLengths())
-		{
-			asc1->SpecifyDataLengths(header.size(), plaintext.size(), footer.size());
-			asc2->SpecifyDataLengths(header.size(), plaintext.size(), footer.size());
-		}
-
-		StringStore sh(header), sp(plaintext), sc(ciphertext), sf(footer), sm(mac);
-
-		if (macAtBegin)
-			RandomizedTransfer(sm, df, true);
-		sh.CopyTo(df, LWORD_MAX, AAD_CHANNEL);
-		RandomizedTransfer(sc, df, true);
-		sf.CopyTo(df, LWORD_MAX, AAD_CHANNEL);
-		if (!macAtBegin)
-			RandomizedTransfer(sm, df, true);
-		df.MessageEnd();
-
-		RandomizedTransfer(sh, ef, true, AAD_CHANNEL);
-		RandomizedTransfer(sp, ef, true);
-		RandomizedTransfer(sf, ef, true, AAD_CHANNEL);
-		ef.MessageEnd();
-
-		if (test == "Encrypt" && encrypted != ciphertext+mac)
-		{
-			std::cout << "incorrectly encrypted: ";
-			StringSource xx(encrypted, false, new HexEncoder(new FileSink(std::cout)));
-			xx.Pump(2048); xx.Flush(false);
-			std::cout << "\n";
-			SignalTestFailure();
-		}
-		if (test == "Encrypt" && decrypted != plaintext)
-		{
-			std::cout << "incorrectly decrypted: ";
-			StringSource xx(decrypted, false, new HexEncoder(new FileSink(std::cout)));
-			xx.Pump(256); xx.Flush(false);
-			std::cout << "\n";
-			SignalTestFailure();
-		}
-
-		if (ciphertext.size()+mac.size()-plaintext.size() != asc1->DigestSize())
-		{
-			std::cout << "bad MAC size\n";
-			SignalTestFailure();
-		}
-		if (df.GetLastResult() != (test == "Encrypt"))
-		{
-			std::cout << "MAC incorrectly verified\n";
-			SignalTestFailure();
-		}
-	}
-	else
-	{
-		std::cout << "unexpected test name\n";
-		SignalTestError();
-	}
-}
-
-void TestDigestOrMAC(TestData &v, bool testDigest)
-{
-	std::string name = GetRequiredDatum(v, "Name");
-	std::string test = GetRequiredDatum(v, "Test");
-	const char *digestName = testDigest ? "Digest" : "MAC";
-
-	member_ptr<MessageAuthenticationCode> mac;
-	member_ptr<HashTransformation> hash;
-	HashTransformation *pHash = NULL;
-
-	TestDataNameValuePairs pairs(v);
-
-	if (testDigest)
-	{
-		hash.reset(ObjectFactoryRegistry<HashTransformation>::Registry().CreateObject(name.c_str()));
-		pHash = hash.get();
-	}
-	else
-	{
-		mac.reset(ObjectFactoryRegistry<MessageAuthenticationCode>::Registry().CreateObject(name.c_str()));
-		pHash = mac.get();
-		std::string key = GetDecodedDatum(v, "Key");
-		mac->SetKey((const byte *)key.c_str(), key.size(), pairs);
-	}
-
-	if (test == "Verify" || test == "VerifyTruncated" || test == "NotVerify")
-	{
-		int digestSize = -1;
-		if (test == "VerifyTruncated")
-			pairs.GetIntValue(Name::DigestSize(), digestSize);
-		HashVerificationFilter verifierFilter(*pHash, NULL, HashVerificationFilter::HASH_AT_BEGIN, digestSize);
-		PutDecodedDatumInto(v, digestName, verifierFilter);
-		PutDecodedDatumInto(v, "Message", verifierFilter);
-		verifierFilter.MessageEnd();
-		if (verifierFilter.GetLastResult() == (test == "NotVerify"))
-			SignalTestFailure();
-	}
-	else
-	{
-		SignalTestError();
-		assert(false);
-	}
-}
-
-bool GetField(std::istream &is, std::string &name, std::string &value)
-{
-	name.resize(0);		// GCC workaround: 2.95.3 doesn't have clear()
-	is >> name;
-	if (name.empty())
-		return false;
-
-	if (name[name.size()-1] != ':')
-	{
-		char c;
-		is >> skipws >> c;
-		if (c != ':')
-			SignalTestError();
-	}
-	else
-		name.erase(name.size()-1);
-
-	while (is.peek() == ' ')
-		is.ignore(1);
-
-	// VC60 workaround: getline bug
-	char buffer[128];
-	value.resize(0);	// GCC workaround: 2.95.3 doesn't have clear()
-	bool continueLine;
-
-	do
-	{
-		do
-		{
-			is.get(buffer, sizeof(buffer));
-			value += buffer;
-		}
-		while (buffer[0] != 0);
-		is.clear();
-		is.ignore();
-
-		if (!value.empty() && value[value.size()-1] == '\r')
-			value.resize(value.size()-1);
-
-		if (!value.empty() && value[value.size()-1] == '\\')
-		{
-			value.resize(value.size()-1);
-			continueLine = true;
-		}
-		else
-			continueLine = false;
-
-		std::string::size_type i = value.find('#');
-		if (i != std::string::npos)
-			value.erase(i);
-	}
-	while (continueLine);
-
-	return true;
-}
-
-void OutputPair(const NameValuePairs &v, const char *name)
-{
-	Integer x;
-	bool b = v.GetValue(name, x);
-	assert(b);
-	cout << name << ": \\\n    ";
-	x.Encode(HexEncoder(new FileSink(cout), false, 64, "\\\n    ").Ref(), x.MinEncodedSize());
-	cout << endl;
-}
-
-void OutputNameValuePairs(const NameValuePairs &v)
-{
-	std::string names = v.GetValueNames();
-	string::size_type i = 0;
-	while (i < names.size())
-	{
-		string::size_type j = names.find_first_of (';', i);
-
-		if (j == string::npos)
-			return;
-		else
-		{
-			std::string name = names.substr(i, j-i);
-			if (name.find(':') == string::npos)
-				OutputPair(v, name.c_str());
-		}
-
-		i = j + 1;
-	}
-}
-
-void TestDataFile(const std::string &filename, const NameValuePairs &overrideParameters, unsigned int &totalTests, unsigned int &failedTests)
-{
-	std::ifstream file(filename.c_str());
-	if (!file.good())
-		throw Exception(Exception::OTHER_ERROR, "Can not open file " + filename + " for reading");
-	TestData v;
-	s_currentTestData = &v;
-	std::string name, value, lastAlgName;
-
-	while (file)
-	{
-		while (file.peek() == '#')
-			file.ignore(INT_MAX, '\n');
-
-		if (file.peek() == '\n' || file.peek() == '\r')
-			v.clear();
-
-		if (!GetField(file, name, value))
-			break;
-		v[name] = value;
-
-		if (name == "Test" && (s_thorough || v["SlowTest"] != "1"))
-		{
-			bool failed = true;
-			std::string algType = GetRequiredDatum(v, "AlgorithmType");
-
-			if (lastAlgName != GetRequiredDatum(v, "Name"))
-			{
-				lastAlgName = GetRequiredDatum(v, "Name");
-				cout << "\nTesting " << algType.c_str() << " algorithm " << lastAlgName.c_str() << ".\n";
-			}
-
-			try
-			{
-				if (algType == "Signature")
-					TestSignatureScheme(v);
-				else if (algType == "SymmetricCipher")
-					TestSymmetricCipher(v, overrideParameters);
-				else if (algType == "AuthenticatedSymmetricCipher")
-					TestAuthenticatedSymmetricCipher(v, overrideParameters);
-				else if (algType == "AsymmetricCipher")
-					TestAsymmetricCipher(v);
-				else if (algType == "MessageDigest")
-					TestDigestOrMAC(v, true);
-				else if (algType == "MAC")
-					TestDigestOrMAC(v, false);
-				else if (algType == "FileList")
-					TestDataFile(GetRequiredDatum(v, "Test"), g_nullNameValuePairs, totalTests, failedTests);
-				else
-					SignalTestError();
-				failed = false;
-			}
-			catch (TestFailure &)
-			{
-				cout << "\nTest failed.\n";
-			}
-			catch (CryptoPP::Exception &e)
-			{
-				cout << "\nCryptoPP::Exception caught: " << e.what() << endl;
-			}
-			catch (std::exception &e)
-			{
-				cout << "\nstd::exception caught: " << e.what() << endl;
-			}
-
-			if (failed)
-			{
-				cout << "Skipping to next test.\n";
-				failedTests++;
-			}
-			else
-				cout << "." << flush;
-
-			totalTests++;
-		}
-	}
-}
-
-bool RunTestDataFile(const char *filename, const NameValuePairs &overrideParameters, bool thorough)
-{
-	s_thorough = thorough;
-	unsigned int totalTests = 0, failedTests = 0;
-	TestDataFile(filename, overrideParameters, totalTests, failedTests);
-	cout << dec << "\nTests complete. Total tests = " << totalTests << ". Failed tests = " << failedTests << ".\n";
-	if (failedTests != 0)
-		cout << "SOME TESTS FAILED!\n";
-	return failedTests == 0;
-}