diff --git a/Filelist.txt b/Filelist.txt
index 983b81e8..663a1b17 100644
--- a/Filelist.txt
+++ b/Filelist.txt
@@ -52,10 +52,7 @@ cpu.cpp
 cpu.h
 crc.cpp
 crc.h
-cryptdll.dsp
 cryptdll.vcproj
-cryptest.dsp
-cryptest.dsw
 cryptest.sh
 cryptest.sln
 cryptest.vcproj
@@ -64,7 +61,6 @@ cryptest_bds.bdsgroup
 cryptest_bds.bdsproj
 cryptest_bds.bpf
 cryptlib.cpp
-cryptlib.dsp
 cryptlib.h
 cryptlib.vcproj
 cryptlib_bds.bdsproj
@@ -84,7 +80,6 @@ dh2.h
 dll.cpp
 dll.h
 dlltest.cpp
-dlltest.dsp
 dlltest.vcproj
 dmac.h
 dsa.cpp
@@ -285,6 +280,7 @@ validat3.cpp
 validate.h
 vmac.cpp
 vmac.h
+vc60.zip
 vs2010.zip
 wait.cpp
 wait.h
diff --git a/GNUmakefile b/GNUmakefile
index d32e56f9..ac0de7b3 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -668,7 +668,7 @@ dlltest.exe: cryptopp.dll $(DLLTESTOBJS)
 	$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
 
 # This recipe prepares the distro files
-TEXT_FILES := *.h *.cpp adhoc.cpp.proto License.txt Readme.txt Install.txt Filelist.txt CMakeLists.txt config.recommend Doxyfile cryptest* cryptlib* dlltest* cryptdll* *.sln *.vcproj *.dsw *.dsp cryptopp.rc TestVectors/*.txt TestData/*.dat
+TEXT_FILES := *.h *.cpp adhoc.cpp.proto License.txt Readme.txt Install.txt Filelist.txt CMakeLists.txt config.recommend Doxyfile cryptest* cryptlib* dlltest* cryptdll* *.sln *.vcproj cryptopp.rc TestVectors/*.txt TestData/*.dat
 EXEC_FILES := GNUmakefile GNUmakefile-cross TestData/ TestVectors/
 
 ifeq ($(wildcard Filelist.txt),Filelist.txt)
diff --git a/config.h b/config.h
index bd168a7c..0dd9a327 100644
--- a/config.h
+++ b/config.h
@@ -262,7 +262,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
 	typedef word32 hword;
 	typedef word64 word;
 #else
-	#define CRYPTOPP_NATIVE_DWORD_AVAILABLE
+	#define CRYPTOPP_NATIVE_DWORD_AVAILABLE 1
 	#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__)
 		#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400
 			// GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3
@@ -271,7 +271,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
 			typedef word64 word;
 			typedef __uint128_t dword;
 			typedef __uint128_t word128;
-			#define CRYPTOPP_WORD128_AVAILABLE
+			#define CRYPTOPP_WORD128_AVAILABLE 1
 		#else
 			// if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results
 			typedef word16 hword;
diff --git a/config.recommend b/config.recommend
index 991355a9..4e1863d7 100644
--- a/config.recommend
+++ b/config.recommend
@@ -262,7 +262,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
 	typedef word32 hword;
 	typedef word64 word;
 #else
-	#define CRYPTOPP_NATIVE_DWORD_AVAILABLE
+	#define CRYPTOPP_NATIVE_DWORD_AVAILABLE 1
 	#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__)
 		#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400
 			// GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3
@@ -271,7 +271,7 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
 			typedef word64 word;
 			typedef __uint128_t dword;
 			typedef __uint128_t word128;
-			#define CRYPTOPP_WORD128_AVAILABLE
+			#define CRYPTOPP_WORD128_AVAILABLE 1
 		#else
 			// if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results
 			typedef word16 hword;
diff --git a/cryptdll.dsp b/cryptdll.dsp
deleted file mode 100644
index 0e09158c..00000000
--- a/cryptdll.dsp
+++ /dev/null
@@ -1,606 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cryptdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=cryptdll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "cryptdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "cryptdll.mak" CFG="cryptdll - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "cryptdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "cryptdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "cryptdll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "cryptdll___Win32_Release"
-# PROP BASE Intermediate_Dir "cryptdll___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "DLL_Release"
-# PROP Intermediate_Dir "DLL_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CRYPTDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /G5 /MT /W3 /GR /GX /Zi /O1 /Ob2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CRYPTOPP_EXPORTS" /D CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1 /D "USE_PRECOMPILED_HEADERS" /Yu"pch.h" /FD /Zm200 /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /dll /machine:I386
-# ADD LINK32 advapi32.lib /nologo /base:"0x42900000" /dll /map /debug /machine:I386 /out:"DLL_Release/cryptopp.dll" /opt:ref
-# SUBTRACT LINK32 /pdb:none
-# Begin Custom Build
-OutDir=.\DLL_Release
-TargetPath=.\DLL_Release\cryptopp.dll
-InputPath=.\DLL_Release\cryptopp.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\cryptopp.mac.done" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	CTRelease\cryptest mac_dll $(TargetPath)
-	echo mac done > $(OutDir)\cryptopp.mac.done
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "cryptdll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cryptdll___Win32_Debug"
-# PROP BASE Intermediate_Dir "cryptdll___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL_Debug"
-# PROP Intermediate_Dir "DLL_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CRYPTDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MTd /W3 /Gm /GR /GX /Zi /Oi /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CRYPTOPP_EXPORTS" /D CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1 /D "USE_PRECOMPILED_HEADERS" /Yu"pch.h" /FD /GZ /Zm200 /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 advapi32.lib /nologo /base:"0x42900000" /dll /incremental:no /debug /machine:I386 /out:"DLL_Debug/cryptopp.dll" /opt:ref
-# SUBTRACT LINK32 /pdb:none
-# Begin Custom Build
-OutDir=.\DLL_Debug
-TargetPath=.\DLL_Debug\cryptopp.dll
-InputPath=.\DLL_Debug\cryptopp.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\cryptopp.mac.done" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	CTDebug\cryptest mac_dll $(TargetPath)
-	echo mac done > $(OutDir)\cryptopp.mac.done
-
-# End Custom Build
-
-!ENDIF
-
-# Begin Target
-
-# Name "cryptdll - Win32 Release"
-# Name "cryptdll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\algebra.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\algparam.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\asn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\authenc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\basecode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cbcmac.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ccm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\channels.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cmac.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cpu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cryptlib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\des.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dessp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dll.cpp
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\dsa.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ec2n.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\eccrypto.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ecp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\emsa2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\eprecomp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\files.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\filters.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\fips140.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\fipstest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gcm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gf2n.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gfpcrypt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\hex.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\hmac.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\hrtimer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\integer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\iterhash.cpp
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\modes.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mqueue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nbtheory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\oaep.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\osrng.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\pch.cpp
-# ADD CPP /Yc"pch.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\pkcspad.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\pssr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\pubkey.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\queue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\randpool.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rdtables.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rijndael.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rng.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rsa.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rw.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sha.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sha3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\simple.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\skipjack.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\strciphr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\trdlocal.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ".h"
-# Begin Source File
-
-SOURCE=.\aes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\algebra.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\algparam.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\argnames.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\asn.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\authenc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\basecode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cbcmac.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ccm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\channels.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cmac.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cryptlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\des.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dh.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dll.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dsa.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ec2n.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\eccrypto.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ecp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\eprecomp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\files.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\filters.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fips140.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fltrimpl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gcm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gf2n.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gfpcrypt.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hkdf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hmac.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\integer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\iterhash.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mdc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\modarith.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\modes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\modexppc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mqueue.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mqv.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nbtheory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\oaep.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\oids.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\osrng.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pch.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pkcspad.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pubkey.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\queue.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\randpool.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rijndael.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rng.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rsa.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\secblock.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\seckey.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sha.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sha3.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\simple.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\skipjack.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\smartptr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\stdcpp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\strciphr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\trdlocal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\words.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\cryptopp.rc
-# End Source File
-# End Target
-# End Project
diff --git a/cryptest.dsp b/cryptest.dsp
deleted file mode 100644
index 27e2f9c9..00000000
--- a/cryptest.dsp
+++ /dev/null
@@ -1,207 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cryptest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=cryptest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "cryptest.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "cryptest.mak" CFG="cryptest - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "cryptest - Win32 DLL-Import Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cryptest - Win32 DLL-Import Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "cryptest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "cryptest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "cryptest - Win32 DLL-Import Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "cryptest___Win32_FIPS_140_Release"
-# PROP BASE Intermediate_Dir "cryptest___Win32_FIPS_140_Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "CT_DLL_Import_Release"
-# PROP Intermediate_Dir "CT_DLL_Import_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G5 /Gz /MT /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm200 /c
-# ADD CPP /nologo /G5 /Gz /MT /W3 /GR /GX /Zi /O1 /Ob2 /D "NDEBUG" /D "CRYPTOPP_IMPORTS" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm400 /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /OPT:NOWIN98
-# ADD LINK32 Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"DLL_Release/cryptest.exe" /libpath:"DLL_Release" /OPT:NOWIN98 /OPT:REF /OPT:ICF
-# SUBTRACT LINK32 /pdb:none /incremental:yes
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Cmds=echo This configuration requires cryptopp.dll.	echo You can build it yourself using the cryptdll project, or	echo obtain a pre-built, FIPS 140-2 validated DLL. If you build it yourself	echo the resulting DLL will not be considered FIPS validated	echo unless it undergoes FIPS validation.
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "cryptest - Win32 DLL-Import Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cryptest___Win32_FIPS_140_Debug"
-# PROP BASE Intermediate_Dir "cryptest___Win32_FIPS_140_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "CT_DLL_Import_Debug"
-# PROP Intermediate_Dir "CT_DLL_Import_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm200 /c
-# ADD CPP /nologo /G5 /Gz /MTd /W3 /GR /GX /Zi /Oi /D "_DEBUG" /D "CRYPTOPP_IMPORTS" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /Zm400 /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /OPT:NOWIN98
-# ADD LINK32 Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"DLL_Debug/cryptest.exe" /pdbtype:sept /libpath:"DLL_Debug" /OPT:NOWIN98
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Cmds=echo This configuration requires cryptopp.dll.	echo You can build it yourself using the cryptdll project, or	echo obtain a pre-built, FIPS 140-2 validated DLL. If you build it yourself	echo the resulting DLL will not be considered FIPS validated	echo unless it undergoes FIPS validation.
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "cryptest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "cryptes0"
-# PROP BASE Intermediate_Dir "cryptes0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "CTRelease"
-# PROP Intermediate_Dir "CTRelease"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /Zi /O1 /Ob2 /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /YX /FD /Zm400 /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 advapi32.lib Ws2_32.lib /nologo /subsystem:console /map /debug /machine:I386 /OPT:NOWIN98 /OPT:REF /OPT:ICF
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "cryptest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cryptes1"
-# PROP BASE Intermediate_Dir "cryptes1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "CTDebug"
-# PROP Intermediate_Dir "CTDebug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /GR /GX /Zi /Oi /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /YX /FD /Zm400 /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 advapi32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /OPT:NOWIN98
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
-# Begin Target
-
-# Name "cryptest - Win32 DLL-Import Release"
-# Name "cryptest - Win32 DLL-Import Debug"
-# Name "cryptest - Win32 Release"
-# Name "cryptest - Win32 Debug"
-# Begin Group "Source Code"
-
-# PROP Default_Filter ".cpp;.h"
-# Begin Source File
-
-SOURCE=.\adhoc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\bench.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\bench1.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\bench2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\datatest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dlltest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\fipsalgt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\regtest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\validat1.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\validat2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\validat3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\validate.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/cryptest.dsw b/cryptest.dsw
deleted file mode 100644
index ed1d37dd..00000000
--- a/cryptest.dsw
+++ /dev/null
@@ -1,74 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "cryptdll"=.\cryptdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name cryptest
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cryptest"=.\cryptest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name cryptlib
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cryptlib"=.\cryptlib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "dlltest"=.\dlltest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name cryptdll
- End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/cryptest.nmake b/cryptest.nmake
index 78afe164..0fc1b11a 100644
--- a/cryptest.nmake
+++ b/cryptest.nmake
@@ -17,10 +17,11 @@
 # You are free to add and remove files to the list. For example, you can remove rdrand.asm
 #   build it using NASM, and then include the NASM object file rdrand_x86.obj or rdrand_x64.obj.
 
-# If you use 'make sources' from Linux makefile, then add 'winpipes.cpp'
-LIB_SRCS = cryptlib.cpp cpu.cpp integer.cpp shacal2.cpp md5.cpp shark.cpp zinflate.cpp gf2n.cpp salsa.cpp xtr.cpp oaep.cpp rc2.cpp default.cpp wait.cpp wake.cpp twofish.cpp iterhash.cpp adler32.cpp algparam.cpp marss.cpp blowfish.cpp ecp.cpp strciphr.cpp camellia.cpp dh2.cpp ida.cpp zlib.cpp elgamal.cpp crc.cpp dessp.cpp tea.cpp eax.cpp network.cpp sha.cpp emsa2.cpp pkcspad.cpp squaretb.cpp idea.cpp authenc.cpp hmac.cpp xtrcrypt.cpp queue.cpp mars.cpp rc5.cpp md2.cpp hrtimer.cpp vmac.cpp eprecomp.cpp hex.cpp dsa.cpp fips140.cpp gzip.cpp seal.cpp blake2.cpp files.cpp base32.cpp sharkbox.cpp safer.cpp randpool.cpp sosemanuk.cpp arc4.cpp osrng.cpp skipjack.cpp seed.cpp sha3.cpp filters.cpp bfinit.cpp rabin.cpp 3way.cpp rw.cpp rdtables.cpp rsa.cpp tftables.cpp gost.cpp socketft.cpp nbtheory.cpp panama.cpp modes.cpp rijndael.cpp casts.cpp algebra.cpp esign.cpp gfpcrypt.cpp dll.cpp ec2n.cpp polynomi.cpp blumshub.cpp des.cpp basecode.cpp zdeflate.cpp base64.cpp rc6.cpp gf256.cpp mqueue.cpp misc.cpp pssr.cpp channels.cpp rng.cpp tiger.cpp cast.cpp square.cpp asn.cpp chacha.cpp whrlpool.cpp md4.cpp dh.cpp ccm.cpp mqv.cpp tigertab.cpp gf2_32.cpp cbcmac.cpp ttmac.cpp luc.cpp trdlocal.cpp pubkey.cpp gcm.cpp ripemd.cpp rdrand.cpp eccrypto.cpp serpent.cpp cmac.cpp winpipes.cpp
+# If you use 'make sources' from Linux makefile, then add 'winpipes.cpp'. Platform specific
+#  classes, like 'rdrand.cpp', should not be included. Add them under the X86 and X64 rules.
+LIB_SRCS = cryptlib.cpp cpu.cpp integer.cpp shacal2.cpp md5.cpp shark.cpp zinflate.cpp gf2n.cpp salsa.cpp xtr.cpp oaep.cpp rc2.cpp default.cpp wait.cpp wake.cpp twofish.cpp iterhash.cpp adler32.cpp algparam.cpp marss.cpp blowfish.cpp ecp.cpp strciphr.cpp camellia.cpp dh2.cpp ida.cpp zlib.cpp elgamal.cpp crc.cpp dessp.cpp tea.cpp eax.cpp network.cpp sha.cpp emsa2.cpp pkcspad.cpp squaretb.cpp idea.cpp authenc.cpp hmac.cpp xtrcrypt.cpp queue.cpp mars.cpp rc5.cpp md2.cpp hrtimer.cpp vmac.cpp eprecomp.cpp hex.cpp dsa.cpp fips140.cpp gzip.cpp seal.cpp blake2.cpp files.cpp base32.cpp sharkbox.cpp safer.cpp randpool.cpp sosemanuk.cpp arc4.cpp osrng.cpp skipjack.cpp seed.cpp sha3.cpp filters.cpp bfinit.cpp rabin.cpp 3way.cpp rw.cpp rdtables.cpp rsa.cpp tftables.cpp gost.cpp socketft.cpp nbtheory.cpp panama.cpp modes.cpp rijndael.cpp casts.cpp algebra.cpp esign.cpp gfpcrypt.cpp dll.cpp ec2n.cpp polynomi.cpp blumshub.cpp des.cpp basecode.cpp zdeflate.cpp base64.cpp rc6.cpp gf256.cpp mqueue.cpp misc.cpp pssr.cpp channels.cpp rng.cpp tiger.cpp cast.cpp square.cpp asn.cpp chacha.cpp whrlpool.cpp md4.cpp dh.cpp ccm.cpp mqv.cpp tigertab.cpp gf2_32.cpp cbcmac.cpp ttmac.cpp luc.cpp trdlocal.cpp pubkey.cpp gcm.cpp ripemd.cpp keccak.cpp eccrypto.cpp serpent.cpp cmac.cpp winpipes.cpp
 
-LIB_OBJS = cryptlib.obj cpu.obj integer.obj shacal2.obj md5.obj shark.obj zinflate.obj gf2n.obj salsa.obj xtr.obj oaep.obj rc2.obj default.obj wait.obj wake.obj twofish.obj iterhash.obj adler32.obj algparam.obj marss.obj blowfish.obj ecp.obj strciphr.obj camellia.obj dh2.obj ida.obj zlib.obj elgamal.obj crc.obj dessp.obj tea.obj eax.obj network.obj sha.obj emsa2.obj pkcspad.obj squaretb.obj idea.obj authenc.obj hmac.obj xtrcrypt.obj queue.obj mars.obj rc5.obj md2.obj hrtimer.obj vmac.obj eprecomp.obj hex.obj dsa.obj fips140.obj gzip.obj seal.obj blake2.obj files.obj base32.obj sharkbox.obj safer.obj randpool.obj sosemanuk.obj arc4.obj osrng.obj skipjack.obj seed.obj sha3.obj filters.obj bfinit.obj rabin.obj 3way.obj rw.obj rdtables.obj rsa.obj tftables.obj gost.obj socketft.obj nbtheory.obj panama.obj modes.obj rijndael.obj casts.obj algebra.obj esign.obj gfpcrypt.obj dll.obj ec2n.obj polynomi.obj blumshub.obj des.obj basecode.obj zdeflate.obj base64.obj rc6.obj gf256.obj mqueue.obj misc.obj pssr.obj channels.obj rng.obj tiger.obj cast.obj square.obj asn.obj chacha.obj whrlpool.obj md4.obj dh.obj ccm.obj mqv.obj tigertab.obj gf2_32.obj cbcmac.obj ttmac.obj luc.obj trdlocal.obj pubkey.obj gcm.obj ripemd.obj rdrand.obj eccrypto.obj serpent.obj cmac.obj winpipes.obj
+LIB_OBJS = cryptlib.obj cpu.obj integer.obj shacal2.obj md5.obj shark.obj zinflate.obj gf2n.obj salsa.obj xtr.obj oaep.obj rc2.obj default.obj wait.obj wake.obj twofish.obj iterhash.obj adler32.obj algparam.obj marss.obj blowfish.obj ecp.obj strciphr.obj camellia.obj dh2.obj ida.obj zlib.obj elgamal.obj crc.obj dessp.obj tea.obj eax.obj network.obj sha.obj emsa2.obj pkcspad.obj squaretb.obj idea.obj authenc.obj hmac.obj xtrcrypt.obj queue.obj mars.obj rc5.obj md2.obj hrtimer.obj vmac.obj eprecomp.obj hex.obj dsa.obj fips140.obj gzip.obj seal.obj blake2.obj files.obj base32.obj sharkbox.obj safer.obj randpool.obj sosemanuk.obj arc4.obj osrng.obj skipjack.obj seed.obj sha3.obj filters.obj bfinit.obj rabin.obj 3way.obj rw.obj rdtables.obj rsa.obj tftables.obj gost.obj socketft.obj nbtheory.obj panama.obj modes.obj rijndael.obj casts.obj algebra.obj esign.obj gfpcrypt.obj dll.obj ec2n.obj polynomi.obj blumshub.obj des.obj basecode.obj zdeflate.obj base64.obj rc6.obj gf256.obj mqueue.obj misc.obj pssr.obj channels.obj rng.obj tiger.obj cast.obj square.obj asn.obj chacha.obj whrlpool.obj md4.obj dh.obj ccm.obj mqv.obj tigertab.obj gf2_32.obj cbcmac.obj ttmac.obj luc.obj trdlocal.obj pubkey.obj gcm.obj ripemd.obj keccak.obj eccrypto.obj serpent.obj cmac.obj winpipes.obj
 
 TEST_SRCS = bench1.cpp bench2.cpp test.cpp validat1.cpp validat2.cpp validat3.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp fipstest.cpp
 
diff --git a/cryptlib.dsp b/cryptlib.dsp
deleted file mode 100644
index b020ad4c..00000000
--- a/cryptlib.dsp
+++ /dev/null
@@ -1,1248 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cryptlib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=cryptlib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "cryptlib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "cryptlib.mak" CFG="cryptlib - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "cryptlib - Win32 DLL-Import Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "cryptlib - Win32 DLL-Import Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "cryptlib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "cryptlib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "cryptlib - Win32 DLL-Import Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "cryptlib___Win32_FIPS_140_Release"
-# PROP BASE Intermediate_Dir "cryptlib___Win32_FIPS_140_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "DLL_Import_Release"
-# PROP Intermediate_Dir "DLL_Import_Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G5 /Gz /MT /W3 /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /Yu"pch.h" /FD /c
-# ADD CPP /nologo /G5 /Gz /MT /W3 /GR /GX /Zi /O2 /Ob2 /D "NDEBUG" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /D "WIN32" /D "CRYPTOPP_IMPORTS" /Yu"pch.h" /FD /Zm400 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "cryptlib - Win32 DLL-Import Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cryptlib___Win32_FIPS_140_Debug"
-# PROP BASE Intermediate_Dir "cryptlib___Win32_FIPS_140_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL_Import_Debug"
-# PROP Intermediate_Dir "DLL_Import_Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /Yu"pch.h" /FD /c
-# ADD CPP /nologo /G5 /Gz /MTd /W3 /GR /GX /Zi /Oi /D "_DEBUG" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /D "WIN32" /D "CRYPTOPP_IMPORTS" /Yu"pch.h" /FD /Zm400 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "cryptlib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "cryptlib"
-# PROP BASE Intermediate_Dir "cryptlib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /Zi /O2 /Ob2 /D "NDEBUG" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /D "WIN32" /Yu"pch.h" /FD /Zm400 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "cryptlib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cryptli0"
-# PROP BASE Intermediate_Dir "cryptli0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /GR /GX /Zi /Oi /D "_DEBUG" /D "_WINDOWS" /D "USE_PRECOMPILED_HEADERS" /D "WIN32" /Yu"pch.h" /FD /Zm400 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "cryptlib - Win32 DLL-Import Release"
-# Name "cryptlib - Win32 DLL-Import Debug"
-# Name "cryptlib - Win32 Release"
-# Name "cryptlib - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ".cpp"
-# Begin Source File
-
-SOURCE=.\3way.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\adhoc.cpp.proto
-
-!IF "$(CFG)" == "cryptlib - Win32 DLL-Import Release"
-
-# Begin Custom Build
-InputPath=.\adhoc.cpp.proto
-
-"adhoc.cpp.copied" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp
-	echo: >> adhoc.cpp.copied
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "cryptlib - Win32 DLL-Import Debug"
-
-# Begin Custom Build
-InputPath=.\adhoc.cpp.proto
-
-"adhoc.cpp.copied" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp
-	echo: >> adhoc.cpp.copied
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "cryptlib - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\adhoc.cpp.proto
-
-"adhoc.cpp.copied" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp
-	echo: >> adhoc.cpp.copied
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "cryptlib - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\adhoc.cpp.proto
-
-"adhoc.cpp.copied" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp
-	echo: >> adhoc.cpp.copied
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\adler32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\algebra.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\algparam.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\arc4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\asn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\authenc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\base32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\base64.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\basecode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\bfinit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\blowfish.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\blake2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\blumshub.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\camellia.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cast.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\casts.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cbcmac.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ccm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\chacha.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\channels.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cmac.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cpu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\crc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cryptlib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\default.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\des.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dessp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dh2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dll.cpp
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\dsa.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\eax.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ec2n.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\eccrypto.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ecp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\elgamal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\emsa2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\eprecomp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\esign.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\files.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\filters.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\fips140.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\fipstest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gcm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gf256.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gf2_32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gf2n.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gfpcrypt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gost.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gzip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\hex.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\hmac.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\hrtimer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ida.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\idea.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\integer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\iterhash.cpp
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\keccak.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\luc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mars.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\marss.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\md2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\md4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\md5.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\modes.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mqueue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mqv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nbtheory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\network.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\oaep.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\osrng.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\panama.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\pch.cpp
-# ADD CPP /Yc"pch.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\pkcspad.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\polynomi.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\pssr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\pubkey.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\queue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rabin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\randpool.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rc2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rc5.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rc6.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rdtables.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rijndael.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ripemd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rng.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rsa.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rw.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\safer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\salsa.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\seal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\seed.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\serpent.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sha.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sha3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\shacal2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\shark.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sharkbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\simple.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\skipjack.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\socketft.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sosemanuk.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\square.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\squaretb.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\strciphr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\tea.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\tftables.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiger.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\tigertab.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\trdlocal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ttmac.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\twofish.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\vmac.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wait.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wake.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\whrlpool.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\winpipes.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xtr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\xtrcrypt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\zdeflate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\zinflate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ".;.h"
-# Begin Source File
-
-SOURCE=.\3way.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\adler32.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\aes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\algebra.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\algparam.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\arc4.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\argnames.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\asn.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\authenc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\base32.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\base64.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\basecode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\blake2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\blowfish.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\blumshub.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\camellia.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cast.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cbcmac.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ccm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\chacha.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\channels.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cmac.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\crc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cryptlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\default.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\des.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dh.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dh2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dmac.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dsa.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dword.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\eax.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ec2n.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\eccrypto.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ecp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\elgamal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\emsa2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\eprecomp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\esign.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\factory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fhmqv.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\files.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\filters.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fips140.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fltrimpl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gcm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gf256.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gf2_32.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gf2n.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gfpcrypt.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gost.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gzip.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hkdf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hmac.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hmqv.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hrtimer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ida.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\idea.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\integer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\iterhash.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\keccak.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\lubyrack.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\luc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mars.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\md2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\md4.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\md5.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mdc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\modarith.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\modes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\modexppc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mqueue.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mqv.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nbtheory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\network.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\oaep.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\oids.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\osrng.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\panama.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pch.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pkcspad.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\polynomi.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pssr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pubkey.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pwdbased.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\queue.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rabin.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\randpool.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rc2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rc5.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rc6.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rijndael.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ripemd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rng.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rsa.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rw.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\safer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\salsa.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\seal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\secblock.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\seckey.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\seed.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\serpent.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sha.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sha3.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\shacal2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\shark.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\simple.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\skipjack.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\smartptr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\socketft.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\square.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\strciphr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tea.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiger.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\trdlocal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\trunhash.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ttmac.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\twofish.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\wait.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\wake.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\whrlpool.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\winpipes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\words.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\xtr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\xtrcrypt.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zdeflate.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zinflate.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib.h
-# End Source File
-# End Group
-# Begin Group "Miscellaneous"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\Doxyfile
-# End Source File
-# Begin Source File
-
-SOURCE=.\GNUmakefile
-# End Source File
-# Begin Source File
-
-SOURCE=.\license.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\readme.txt
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/dlltest.dsp b/dlltest.dsp
deleted file mode 100644
index 3083cedb..00000000
--- a/dlltest.dsp
+++ /dev/null
@@ -1,90 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dlltest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=dlltest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "dlltest.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "dlltest.mak" CFG="dlltest - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "dlltest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dlltest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "dlltest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "dlltest___Win32_Release"
-# PROP BASE Intermediate_Dir "dlltest___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "dlltest___Win32_Release"
-# PROP Intermediate_Dir "dlltest___Win32_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gz /MT /W3 /GR /GX /Zi /O1 /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "CRYPTOPP_DLL_ONLY" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /map /debug /machine:I386 /out:"DLL_Release/dlltest.exe" /libpath:"DLL_Release"
-
-!ELSEIF "$(CFG)" == "dlltest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "dlltest___Win32_Debug"
-# PROP BASE Intermediate_Dir "dlltest___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "dlltest___Win32_Debug"
-# PROP Intermediate_Dir "dlltest___Win32_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Gz /MTd /W3 /Gm /GR /GX /Zi /Oi /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "CRYPTOPP_DLL_ONLY" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"DLL_Debug/dlltest.exe" /pdbtype:sept /libpath:"DLL_Debug"
-
-!ENDIF
-
-# Begin Target
-
-# Name "dlltest - Win32 Release"
-# Name "dlltest - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\dlltest.cpp
-# End Source File
-# End Target
-# End Project
diff --git a/vc60.zip b/vc60.zip
new file mode 100644
index 00000000..eda6bd9d
Binary files /dev/null and b/vc60.zip differ