diff --git a/cryptest.sln b/cryptest.sln
index da12908d..a8597150 100644
--- a/cryptest.sln
+++ b/cryptest.sln
@@ -1,23 +1,23 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{c2c253b8-c68e-475c-9471-f5a55ac49cd1}") = "cryptest", "cryptest.vcxproj", "{09cdac08-e6ae-48a9-8de7-0fbc779eebde}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptest", "cryptest.vcxproj", "{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{c39f4b46-6e89-4074-902e-ca57073044d2} = {c39f4b46-6e89-4074-902e-ca57073044d2}
+		{C39F4B46-6E89-4074-902E-CA57073044D2} = {C39F4B46-6E89-4074-902E-CA57073044D2}
 	EndProjectSection
 EndProject
-Project("{c2c253b8-c68e-475c-9471-f5a55ac49cd1}") = "cryptlib", "cryptlib.vcxproj", "{c39f4b46-6e89-4074-902e-ca57073044d2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "cryptlib.vcxproj", "{C39F4B46-6E89-4074-902E-CA57073044D2}"
 EndProject
-Project("{c2c253b8-c68e-475c-9471-f5a55ac49cd1}") = "dlltest", "dlltest.vcxproj", "{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlltest", "dlltest.vcxproj", "{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde} = {09cdac08-e6ae-48a9-8de7-0fbc779eebde}
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257} = {94a428a1-9ba8-4db2-b76e-bd2e3c08f257}
-		{c39f4b46-6e89-4074-902e-ca57073044d2} = {c39f4b46-6e89-4074-902e-ca57073044d2}
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE} = {09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257} = {94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}
+		{C39F4B46-6E89-4074-902E-CA57073044D2} = {C39F4B46-6E89-4074-902E-CA57073044D2}
 	EndProjectSection
 EndProject
-Project("{c2c253b8-c68e-475c-9471-f5a55ac49cd1}") = "cryptdll", "cryptdll.vcxproj", "{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptdll", "cryptdll.vcxproj", "{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}"
 	ProjectSection(ProjectDependencies) = postProject
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde} = {09cdac08-e6ae-48a9-8de7-0fbc779eebde}
-		{c39f4b46-6e89-4074-902e-ca57073044d2} = {c39f4b46-6e89-4074-902e-ca57073044d2}
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE} = {09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}
+		{C39F4B46-6E89-4074-902E-CA57073044D2} = {C39F4B46-6E89-4074-902E-CA57073044D2}
 	EndProjectSection
 EndProject
 Global
@@ -32,62 +32,62 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.Debug|Win32.ActiveCfg = Debug|Win32
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.Debug|Win32.Build.0 = Debug|Win32
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.Debug|x64.ActiveCfg = Debug|x64
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.Debug|x64.Build.0 = Debug|x64
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.Release|Win32.ActiveCfg = Release|Win32
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.Release|Win32.Build.0 = Release|Win32
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.Release|x64.ActiveCfg = Release|x64
-		{09cdac08-e6ae-48a9-8de7-0fbc779eebde}.Release|x64.Build.0 = Release|x64
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.Debug|Win32.Build.0 = Debug|Win32
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.Debug|x64.ActiveCfg = Debug|x64
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.Debug|x64.Build.0 = Debug|x64
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.Release|Win32.ActiveCfg = Release|Win32
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.Release|Win32.Build.0 = Release|Win32
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.Release|x64.ActiveCfg = Release|x64
-		{c39f4b46-6e89-4074-902e-ca57073044d2}.Release|x64.Build.0 = Release|x64
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.Debug|x64.ActiveCfg = Debug|x64
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.DLL-Import Release|x64.Build.0 = Release|x64
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.Release|Win32.ActiveCfg = Release|Win32
-		{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}.Release|x64.ActiveCfg = Release|x64
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.Debug|Win32.ActiveCfg = Debug|Win32
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.Debug|x64.ActiveCfg = Debug|x64
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.DLL-Import Release|x64.Build.0 = Release|x64
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.Release|Win32.ActiveCfg = Release|Win32
-		{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}.Release|x64.ActiveCfg = Release|x64
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Debug|Win32.Build.0 = Debug|Win32
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Debug|x64.ActiveCfg = Debug|x64
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Debug|x64.Build.0 = Debug|x64
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Release|Win32.ActiveCfg = Release|Win32
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Release|Win32.Build.0 = Release|Win32
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Release|x64.ActiveCfg = Release|x64
+		{09CDAC08-E6AE-48A9-8DE7-0FBC779EEBDE}.Release|x64.Build.0 = Release|x64
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.Debug|Win32.Build.0 = Debug|Win32
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.Debug|x64.ActiveCfg = Debug|x64
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.Debug|x64.Build.0 = Debug|x64
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.Release|Win32.ActiveCfg = Release|Win32
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.Release|Win32.Build.0 = Release|Win32
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.Release|x64.ActiveCfg = Release|x64
+		{C39F4B46-6E89-4074-902E-CA57073044D2}.Release|x64.Build.0 = Release|x64
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.Debug|x64.ActiveCfg = Debug|x64
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.DLL-Import Release|x64.Build.0 = Release|x64
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.Release|Win32.ActiveCfg = Release|Win32
+		{1974A53A-9863-41C9-886D-B2B8C2FC3C8B}.Release|x64.ActiveCfg = Release|x64
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.Debug|Win32.ActiveCfg = Debug|Win32
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.Debug|x64.ActiveCfg = Debug|x64
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Release|Win32.Build.0 = Release|Win32
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.DLL-Import Release|x64.Build.0 = Release|x64
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.Release|Win32.ActiveCfg = Release|Win32
+		{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.Release|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE