diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17a67e4ea..8003f6b6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ endif()
 file(GLOB cryptopp_HEADERS *.h)
 
 # Test sources
-file(GLOB cryptopp_SOURCES_TEST bench.cpp bench2.cpp test.cpp validat1.cpp validat2.cpp validat3.cpp adhoc.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp fipstest.cpp)
+file(GLOB cryptopp_SOURCES_TEST bench1.cpp bench2.cpp test.cpp validat1.cpp validat2.cpp validat3.cpp adhoc.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp fipstest.cpp)
 
 # Library sources
 file(GLOB cryptopp_SOURCES *.cpp)
diff --git a/Filelist.txt b/Filelist.txt
index 98cf24620..c20322cf0 100644
--- a/Filelist.txt
+++ b/Filelist.txt
@@ -21,8 +21,8 @@ base64.cpp
 base64.h
 basecode.cpp
 basecode.h
-bench.cpp
 bench.h
+bench1.cpp
 bench2.cpp
 bfinit.cpp
 blake2.cpp
diff --git a/GNUmakefile b/GNUmakefile
index d24dfb506..8029ea4d0 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -338,7 +338,7 @@ endif
 OBJS := $(SRCS:.cpp=.o)
 
 # test.o needs to be after bench.o for cygwin 1.1.4 (possible ld bug?)
-TESTSRCS := bench.cpp bench2.cpp test.cpp validat1.cpp validat2.cpp validat3.cpp adhoc.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp
+TESTSRCS := bench1.cpp bench2.cpp test.cpp validat1.cpp validat2.cpp validat3.cpp adhoc.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp
 TESTOBJS := $(TESTSRCS:.cpp=.o)
 LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))
 
@@ -647,8 +647,6 @@ ifeq ($(findstring -DCRYPTOPP_DATA_DIR,$(CXXFLAGS)),)
 ifneq ($(strip $(CRYPTOPP_DATA_DIR)),)
 validat%.o : validat%.cpp
 	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
-bench.o : bench.cpp
-	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
 bench%.o : bench%.cpp
 	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
 datatest.o : datatest.cpp
diff --git a/GNUmakefile-cross b/GNUmakefile-cross
index 01ede28e5..bad3c5a36 100755
--- a/GNUmakefile-cross
+++ b/GNUmakefile-cross
@@ -117,7 +117,7 @@ SRCS := cryptlib.cpp cpu.cpp $(filter-out cryptlib.cpp cpu.cpp pch.cpp simple.cp
 OBJS := $(SRCS:.cpp=.o)
 
 # test.o needs to be after bench.o for cygwin 1.1.4 (possible ld bug?)
-TESTSRCS := bench.cpp bench2.cpp test.cpp validat1.cpp validat2.cpp validat3.cpp adhoc.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp
+TESTSRCS := bench1.cpp bench2.cpp test.cpp validat1.cpp validat2.cpp validat3.cpp adhoc.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp
 TESTOBJS := $(TESTSRCS:.cpp=.o)
 LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))
 
diff --git a/bench1.cpp b/bench1.cpp
new file mode 100644
index 000000000..5caaebaac
--- /dev/null
+++ b/bench1.cpp
@@ -0,0 +1,390 @@
+// bench1.cpp - written and placed in the public domain by Wei Dai
+
+#include "cryptlib.h"
+#include "bench.h"
+#include "validate.h"
+
+#include "aes.h"
+#include "blumshub.h"
+#include "files.h"
+#include "filters.h"
+#include "hex.h"
+#include "modes.h"
+#include "factory.h"
+#include "smartptr.h"
+#include "cpu.h"
+
+#include <time.h>
+#include <math.h>
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+
+// These are noisy enoguh due to test.cpp. Turn them off here.
+#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+USING_NAMESPACE(CryptoPP)
+USING_NAMESPACE(std)
+
+#ifdef CLOCKS_PER_SEC
+const double CLOCK_TICKS_PER_SECOND = (double)CLOCKS_PER_SEC;
+#elif defined(CLK_TCK)
+const double CLOCK_TICKS_PER_SECOND = (double)CLK_TCK;
+#else
+const double CLOCK_TICKS_PER_SECOND = 1000000.0;
+#endif
+
+double logtotal = 0.0, g_allocatedTime = 0, g_hertz = 0;
+unsigned int logcount = 0;
+
+static const byte defaultKey[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
+
+void OutputResultBytes(const char *name, double length, double timeTaken)
+{
+	// Coverity finding, also see http://stackoverflow.com/a/34509163/608639.
+	StreamState ss(cout);
+	
+	// Coverity finding
+	if (length < 0.0000000001f) length = 0.000001f;
+	if (timeTaken < 0.0000000001f) timeTaken = 0.000001f;
+
+	double mbs = length / timeTaken / (1024*1024);
+	cout << "\n<TR><TH>" << name;
+//	cout << "<TD>" << setprecision(3) << length / (1024*1024);
+	cout << setiosflags(ios::fixed);
+//	cout << "<TD>" << setprecision(3) << timeTaken;
+	cout << "<TD>" << setprecision(0) << setiosflags(ios::fixed) << mbs;
+	if (g_hertz)
+		cout << "<TD>" << setprecision(1) << setiosflags(ios::fixed) << timeTaken * g_hertz / length;
+	logtotal += log(mbs);
+	logcount++;
+}
+
+void OutputResultKeying(double iterations, double timeTaken)
+{
+	// Coverity finding, also see http://stackoverflow.com/a/34509163/608639.
+	StreamState ss(cout);
+	
+	// Coverity finding
+	if (iterations < 0.0000000001f) iterations = 0.000001f;
+	if (timeTaken < 0.0000000001f) timeTaken = 0.000001f;
+
+	cout << "<TD>" << setprecision(3) << setiosflags(ios::fixed) << (1000*1000*timeTaken/iterations);
+	if (g_hertz)
+		cout << "<TD>" << setprecision(0) << setiosflags(ios::fixed) << timeTaken * g_hertz / iterations;
+}
+
+void OutputResultOperations(const char *name, const char *operation, bool pc, unsigned long iterations, double timeTaken)
+{
+	// Coverity finding, also see http://stackoverflow.com/a/34509163/608639.
+	StreamState ss(cout);
+	
+	// Coverity finding
+	if (!iterations) iterations++;
+	if (timeTaken < 0.0000000001f) timeTaken = 0.000001f;
+
+	cout << "\n<TR><TH>" << name << " " << operation << (pc ? " with precomputation" : "");
+	cout << "<TD>" << setprecision(2) << setiosflags(ios::fixed) << (1000*timeTaken/iterations);
+	if (g_hertz)
+		cout << "<TD>" << setprecision(2) << setiosflags(ios::fixed) << timeTaken * g_hertz / iterations / 1000000;
+
+	logtotal += log(iterations/timeTaken);
+	logcount++;
+}
+
+/*
+void BenchMark(const char *name, BlockTransformation &cipher, double timeTotal)
+{
+	const int BUF_SIZE = RoundUpToMultipleOf(2048U, cipher.OptimalNumberOfParallelBlocks() * cipher.BlockSize());
+	AlignedSecByteBlock buf(BUF_SIZE);
+	const int nBlocks = BUF_SIZE / cipher.BlockSize();
+	clock_t start = clock();
+
+	unsigned long i=0, blocks=1;
+	double timeTaken;
+	do
+	{
+		blocks *= 2;
+		for (; i<blocks; i++)
+			cipher.ProcessAndXorMultipleBlocks(buf, NULL, buf, nBlocks);
+		timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND;
+	}
+	while (timeTaken < 2.0/3*timeTotal);
+
+	OutputResultBytes(name, double(blocks) * BUF_SIZE, timeTaken);
+}
+*/
+
+void BenchMark(const char *name, StreamTransformation &cipher, double timeTotal)
+{
+	const int BUF_SIZE=RoundUpToMultipleOf(2048U, cipher.OptimalBlockSize());
+	AlignedSecByteBlock buf(BUF_SIZE);
+	GlobalRNG().GenerateBlock(buf, BUF_SIZE);
+	clock_t start = clock();
+
+	unsigned long i=0, blocks=1;
+	double timeTaken;
+	do
+	{
+		blocks *= 2;
+		for (; i<blocks; i++)
+			cipher.ProcessString(buf, BUF_SIZE);
+		timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND;
+	}
+	while (timeTaken < 2.0/3*timeTotal);
+
+	OutputResultBytes(name, double(blocks) * BUF_SIZE, timeTaken);
+}
+
+void BenchMark(const char *name, AuthenticatedSymmetricCipher &cipher, double timeTotal)
+{
+	if (cipher.NeedsPrespecifiedDataLengths())
+		cipher.SpecifyDataLengths(0, cipher.MaxMessageLength(), 0);
+
+	BenchMark(name, static_cast<StreamTransformation &>(cipher), timeTotal);
+}
+
+void BenchMark(const char *name, HashTransformation &ht, double timeTotal)
+{
+	const int BUF_SIZE=2048U;
+	AlignedSecByteBlock buf(BUF_SIZE);
+	GlobalRNG().GenerateBlock(buf, BUF_SIZE);
+	clock_t start = clock();
+
+	unsigned long i=0, blocks=1;
+	double timeTaken;
+	do
+	{
+		blocks *= 2;
+		for (; i<blocks; i++)
+			ht.Update(buf, BUF_SIZE);
+		timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND;
+	}
+	while (timeTaken < 2.0/3*timeTotal);
+
+	OutputResultBytes(name, double(blocks) * BUF_SIZE, timeTaken);
+}
+
+void BenchMark(const char *name, BufferedTransformation &bt, double timeTotal)
+{
+	const int BUF_SIZE=2048U;
+	AlignedSecByteBlock buf(BUF_SIZE);
+	GlobalRNG().GenerateBlock(buf, BUF_SIZE);
+	clock_t start = clock();
+
+	unsigned long i=0, blocks=1;
+	double timeTaken;
+	do
+	{
+		blocks *= 2;
+		for (; i<blocks; i++)
+			bt.Put(buf, BUF_SIZE);
+		timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND;
+	}
+	while (timeTaken < 2.0/3*timeTotal);
+
+	OutputResultBytes(name, double(blocks) * BUF_SIZE, timeTaken);
+}
+
+void BenchMarkKeying(SimpleKeyingInterface &c, size_t keyLength, const NameValuePairs &params)
+{
+	unsigned long iterations = 0;
+	clock_t start = clock();
+	double timeTaken;
+	do
+	{
+		for (unsigned int i=0; i<1024; i++)
+			c.SetKey(defaultKey, keyLength, params);
+		timeTaken = double(clock() - start) / CLOCK_TICKS_PER_SECOND;
+		iterations += 1024;
+	}
+	while (timeTaken < g_allocatedTime);
+
+	OutputResultKeying(iterations, timeTaken);
+}
+
+//VC60 workaround: compiler bug triggered without the extra dummy parameters
+// on VC60 also needs to be named differently from BenchMarkByName
+template <class T_FactoryOutput, class T_Interface>
+void BenchMarkByName2(const char *factoryName, size_t keyLength = 0, const char *displayName=NULL, const NameValuePairs &params = g_nullNameValuePairs, T_FactoryOutput *x=NULL, T_Interface *y=NULL)
+{
+	CRYPTOPP_UNUSED(x), CRYPTOPP_UNUSED(y), CRYPTOPP_UNUSED(params);
+
+	std::string name(factoryName ? factoryName : "");
+	member_ptr<T_FactoryOutput> obj(ObjectFactoryRegistry<T_FactoryOutput>::Registry().CreateObject(name.c_str()));
+	
+	if (!keyLength)
+		keyLength = obj->DefaultKeyLength();
+
+	if (displayName)
+		name = displayName;
+	else if (keyLength)
+		name += " (" + IntToString(keyLength * 8) + "-bit key)";
+
+	obj->SetKey(defaultKey, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(defaultKey, obj->IVSize()), false)));
+	BenchMark(name.c_str(), *static_cast<T_Interface *>(obj.get()), g_allocatedTime);
+	BenchMarkKeying(*obj, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(defaultKey, obj->IVSize()), false)));
+}
+
+//VC60 workaround: compiler bug triggered without the extra dummy parameters
+template <class T_FactoryOutput>
+void BenchMarkByName(const char *factoryName, size_t keyLength = 0, const char *displayName=NULL, const NameValuePairs &params = g_nullNameValuePairs, T_FactoryOutput *x=NULL)
+{
+	CRYPTOPP_UNUSED(x), CRYPTOPP_UNUSED(params);
+
+	BenchMarkByName2<T_FactoryOutput, T_FactoryOutput>(factoryName, keyLength, displayName, params, x, x);
+}
+
+template <class T>
+void BenchMarkByNameKeyLess(const char *factoryName, const char *displayName=NULL, const NameValuePairs &params = g_nullNameValuePairs, T *x=NULL)
+{
+	CRYPTOPP_UNUSED(x), CRYPTOPP_UNUSED(params);
+
+	std::string name = factoryName;
+	if (displayName)
+		name = displayName;
+
+	member_ptr<T> obj(ObjectFactoryRegistry<T>::Registry().CreateObject(factoryName));
+	BenchMark(name.c_str(), *obj, g_allocatedTime);
+}
+
+void BenchmarkAll(double t, double hertz)
+{
+#if 1
+	logtotal = 0;
+	logcount = 0;
+	g_allocatedTime = t;
+	g_hertz = hertz;
+
+	const char *cpb, *cpk;
+	if (g_hertz)
+	{
+		cpb = "<TH>Cycles Per Byte";
+		cpk = "<TH>Cycles to<br>Setup Key and IV";
+		cout << "CPU frequency of the test platform is " << g_hertz << " Hz.\n";
+	}
+	else
+	{
+		cpb = cpk = "";
+		cout << "CPU frequency of the test platform was not provided.\n";
+	}
+
+	cout << "<TABLE border=1><COLGROUP><COL align=left><COL align=right><COL align=right><COL align=right><COL align=right>" << endl;
+	cout << "<THEAD><TR><TH>Algorithm<TH>MiB/Second" << cpb << "<TH>Microseconds to<br>Setup Key and IV" << cpk << endl;
+
+	cout << "\n<TBODY style=\"background: yellow\">";
+#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
+	if (HasCLMUL())
+		BenchMarkByName2<AuthenticatedSymmetricCipher, AuthenticatedSymmetricCipher>("AES/GCM", 0, "AES/GCM");
+	else
+#endif
+	{
+		BenchMarkByName2<AuthenticatedSymmetricCipher, AuthenticatedSymmetricCipher>("AES/GCM", 0, "AES/GCM (2K tables)", MakeParameters(Name::TableSize(), 2048));
+		BenchMarkByName2<AuthenticatedSymmetricCipher, AuthenticatedSymmetricCipher>("AES/GCM", 0, "AES/GCM (64K tables)", MakeParameters(Name::TableSize(), 64*1024));
+	}
+	BenchMarkByName2<AuthenticatedSymmetricCipher, AuthenticatedSymmetricCipher>("AES/CCM");
+	BenchMarkByName2<AuthenticatedSymmetricCipher, AuthenticatedSymmetricCipher>("AES/EAX");
+
+	cout << "\n<TBODY style=\"background: white\">";
+#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
+	if (HasCLMUL())
+		BenchMarkByName2<AuthenticatedSymmetricCipher, MessageAuthenticationCode>("AES/GCM", 0, "GMAC(AES)");
+	else
+#endif
+	{
+		BenchMarkByName2<AuthenticatedSymmetricCipher, MessageAuthenticationCode>("AES/GCM", 0, "GMAC(AES) (2K tables)", MakeParameters(Name::TableSize(), 2048));
+		BenchMarkByName2<AuthenticatedSymmetricCipher, MessageAuthenticationCode>("AES/GCM", 0, "GMAC(AES) (64K tables)", MakeParameters(Name::TableSize(), 64*1024));
+	}
+	BenchMarkByName<MessageAuthenticationCode>("VMAC(AES)-64");
+	BenchMarkByName<MessageAuthenticationCode>("VMAC(AES)-128");
+	BenchMarkByName<MessageAuthenticationCode>("HMAC(SHA-1)");
+	BenchMarkByName<MessageAuthenticationCode>("Two-Track-MAC");
+	BenchMarkByName<MessageAuthenticationCode>("CMAC(AES)");
+	BenchMarkByName<MessageAuthenticationCode>("DMAC(AES)");
+
+	cout << "\n<TBODY style=\"background: yellow\">";
+	BenchMarkByNameKeyLess<HashTransformation>("CRC32");
+	BenchMarkByNameKeyLess<HashTransformation>("Adler32");
+	BenchMarkByNameKeyLess<HashTransformation>("MD5");
+	BenchMarkByNameKeyLess<HashTransformation>("SHA-1");
+	BenchMarkByNameKeyLess<HashTransformation>("SHA-256");
+	BenchMarkByNameKeyLess<HashTransformation>("SHA-512");
+	BenchMarkByNameKeyLess<HashTransformation>("SHA-3-224");
+	BenchMarkByNameKeyLess<HashTransformation>("SHA-3-256");
+	BenchMarkByNameKeyLess<HashTransformation>("SHA-3-384");
+	BenchMarkByNameKeyLess<HashTransformation>("SHA-3-512");
+	BenchMarkByNameKeyLess<HashTransformation>("Tiger");
+	BenchMarkByNameKeyLess<HashTransformation>("Whirlpool");
+	BenchMarkByNameKeyLess<HashTransformation>("RIPEMD-160");
+	BenchMarkByNameKeyLess<HashTransformation>("RIPEMD-320");
+	BenchMarkByNameKeyLess<HashTransformation>("RIPEMD-128");
+	BenchMarkByNameKeyLess<HashTransformation>("RIPEMD-256");
+
+	cout << "\n<TBODY style=\"background: white\">";
+	BenchMarkByName<SymmetricCipher>("Panama-LE");
+	BenchMarkByName<SymmetricCipher>("Panama-BE");
+	BenchMarkByName<SymmetricCipher>("Salsa20");
+	BenchMarkByName<SymmetricCipher>("Salsa20", 0, "Salsa20/12", MakeParameters(Name::Rounds(), 12));
+	BenchMarkByName<SymmetricCipher>("Salsa20", 0, "Salsa20/8", MakeParameters(Name::Rounds(), 8));
+	BenchMarkByName<SymmetricCipher>("Sosemanuk");
+	BenchMarkByName<SymmetricCipher>("MARC4");
+	BenchMarkByName<SymmetricCipher>("SEAL-3.0-LE");
+	BenchMarkByName<SymmetricCipher>("WAKE-OFB-LE");
+
+	cout << "\n<TBODY style=\"background: yellow\">";
+	BenchMarkByName<SymmetricCipher>("AES/CTR", 16);
+	BenchMarkByName<SymmetricCipher>("AES/CTR", 24);
+	BenchMarkByName<SymmetricCipher>("AES/CTR", 32);
+	BenchMarkByName<SymmetricCipher>("AES/CBC", 16);
+	BenchMarkByName<SymmetricCipher>("AES/CBC", 24);
+	BenchMarkByName<SymmetricCipher>("AES/CBC", 32);
+	BenchMarkByName<SymmetricCipher>("AES/OFB", 16);
+	BenchMarkByName<SymmetricCipher>("AES/CFB", 16);
+	BenchMarkByName<SymmetricCipher>("AES/ECB", 16);
+	BenchMarkByName<SymmetricCipher>("Camellia/CTR", 16);
+	BenchMarkByName<SymmetricCipher>("Camellia/CTR", 32);
+	BenchMarkByName<SymmetricCipher>("Twofish/CTR");
+	BenchMarkByName<SymmetricCipher>("Serpent/CTR");
+	BenchMarkByName<SymmetricCipher>("CAST-256/CTR");
+	BenchMarkByName<SymmetricCipher>("RC6/CTR");
+	BenchMarkByName<SymmetricCipher>("MARS/CTR");
+	BenchMarkByName<SymmetricCipher>("SHACAL-2/CTR", 16);
+	BenchMarkByName<SymmetricCipher>("SHACAL-2/CTR", 64);
+	BenchMarkByName<SymmetricCipher>("DES/CTR");
+	BenchMarkByName<SymmetricCipher>("DES-XEX3/CTR");
+	BenchMarkByName<SymmetricCipher>("DES-EDE3/CTR");
+	BenchMarkByName<SymmetricCipher>("IDEA/CTR");
+	BenchMarkByName<SymmetricCipher>("RC5/CTR", 0, "RC5 (r=16)");
+	BenchMarkByName<SymmetricCipher>("Blowfish/CTR");
+	BenchMarkByName<SymmetricCipher>("TEA/CTR");
+	BenchMarkByName<SymmetricCipher>("XTEA/CTR");
+	BenchMarkByName<SymmetricCipher>("CAST-128/CTR");
+	BenchMarkByName<SymmetricCipher>("SKIPJACK/CTR");
+	BenchMarkByName<SymmetricCipher>("SEED/CTR", 0, "SEED/CTR (1/2 K table)");
+	cout << "</TABLE>" << endl;
+
+	BenchmarkAll2(t, hertz);
+	cout << "Throughput Geometric Average: " << setiosflags(ios::fixed) << exp(logtotal/(logcount ? logcount : 1)) << endl;
+
+// Safer functions on Windows for C&A, https://github.com/weidai11/cryptopp/issues/55
+#if (CRYPTOPP_MSC_VERSION >= 1400)
+	tm localTime = {};
+	char timeBuf[64];
+	errno_t err;
+
+	const time_t endTime = time(NULL);
+	err = localtime_s(&localTime, &endTime);
+	assert(err == 0);
+	err = asctime_s(timeBuf, sizeof(timeBuf), &localTime);
+	assert(err == 0);
+
+	cout << "\nTest ended at " << timeBuf;
+#else
+	const time_t endTime = time(NULL);
+	cout << "\nTest ended at " << asctime(localtime(&endTime));
+#endif
+#endif
+}
diff --git a/cryptest.dsp b/cryptest.dsp
index 5c4d94afc..e3c21d1b7 100644
--- a/cryptest.dsp
+++ b/cryptest.dsp
@@ -156,11 +156,11 @@ SOURCE=.\adhoc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bench.cpp
+SOURCE=.\bench.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bench.h
+SOURCE=.\bench1.cpp
 # End Source File
 # Begin Source File
 
diff --git a/cryptest.vcproj b/cryptest.vcproj
index 596cac62c..8b72c5fe4 100644
--- a/cryptest.vcproj
+++ b/cryptest.vcproj
@@ -810,7 +810,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="bench.cpp"
+				RelativePath="bench1.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
diff --git a/cryptest_bds.bdsproj b/cryptest_bds.bdsproj
index 9086d3088..5b4b469b7 100644
--- a/cryptest_bds.bdsproj
+++ b/cryptest_bds.bdsproj
@@ -199,8 +199,8 @@
         <FILE FILENAME="validat1.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="validat1" FORMNAME="" DESIGNCLASS=""/>
         <FILE FILENAME="validat2.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="validat2" FORMNAME="" DESIGNCLASS=""/>
         <FILE FILENAME="validat3.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="validat3" FORMNAME="" DESIGNCLASS=""/>
-        <FILE FILENAME="bench2.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="bench2" FORMNAME="" DESIGNCLASS=""/>
-        <FILE FILENAME="bench.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="bench" FORMNAME="" DESIGNCLASS=""/>
+        <FILE FILENAME="bench1.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="bench2" FORMNAME="" DESIGNCLASS=""/>
+        <FILE FILENAME="bench2.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="bench" FORMNAME="" DESIGNCLASS=""/>
         <FILE FILENAME="datatest.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="datatest" FORMNAME="" DESIGNCLASS=""/>
       </FILELIST>
       <IDEOPTIONS>
diff --git a/vs2010.zip b/vs2010.zip
old mode 100755
new mode 100644
index b533ab114..ec0d98ecd
Binary files a/vs2010.zip and b/vs2010.zip differ