diff --git a/.gitignore b/.gitignore index 8f9c59fa..a47195eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.cmake *.dSYM +*.exp *.la *.lo *.log diff --git a/builds/msvc/.gitignore b/builds/msvc/.gitignore index 1bf6266d..79234a2a 100644 --- a/builds/msvc/.gitignore +++ b/builds/msvc/.gitignore @@ -3,3 +3,4 @@ *.sdf *.vcxproj.user *.aps +*.log diff --git a/builds/msvc/vs2010/libsodium.sln b/builds/msvc/vs2010/libsodium.sln new file mode 100644 index 00000000..8ca871bf --- /dev/null +++ b/builds/msvc/vs2010/libsodium.sln @@ -0,0 +1,50 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "libsodium\libsodium.vcxproj", "{A185B162-6CB6-4502-B03F-B56F7699A8D9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + DynDebug|Win32 = DynDebug|Win32 + DynDebug|x64 = DynDebug|x64 + DynRelease|Win32 = DynRelease|Win32 + DynRelease|x64 = DynRelease|x64 + LtcgDebug|Win32 = LtcgDebug|Win32 + LtcgDebug|x64 = LtcgDebug|x64 + LtcgRelease|Win32 = LtcgRelease|Win32 + LtcgRelease|x64 = LtcgRelease|x64 + StaticDebug|Win32 = StaticDebug|Win32 + StaticDebug|x64 = StaticDebug|x64 + StaticRelease|Win32 = StaticRelease|Win32 + StaticRelease|x64 = StaticRelease|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.Build.0 = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.ActiveCfg = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.Build.0 = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.Build.0 = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.Build.0 = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.Build.0 = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.ActiveCfg = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.Build.0 = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.Build.0 = ReleaseLIB|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/builds/msvc/vs2010/libsodium/libsodium.props b/builds/msvc/vs2010/libsodium/libsodium.props new file mode 100644 index 00000000..0b13e4bf --- /dev/null +++ b/builds/msvc/vs2010/libsodium/libsodium.props @@ -0,0 +1,32 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Libsodium Common Settings + AllRules.ruleset + false + + + + + $(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + 4146;4244;%(DisableSpecificWarnings) + false + inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + + + + SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + DLL_EXPORT;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj new file mode 100644 index 00000000..fd9e7ddc --- /dev/null +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -0,0 +1,372 @@ + + + + {A185B162-6CB6-4502-B03F-B56F7699A8D9} + libsodium + libsodium10 + + + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + DebugDLL + x64 + + + ReleaseDLL + x64 + + + DebugLTCG + Win32 + + + ReleaseLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + x64 + + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + + + + v100 + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters new file mode 100644 index 00000000..805f7e01 --- /dev/null +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters @@ -0,0 +1,591 @@ + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + resource + + + + + packaging + + + packaging + + + packaging + + + packaging + + + packaging + + + + + {03c1f568-fa7f-499c-a616-a8e0f5050b97} + + + {ddaca9ce-4d7d-4395-bfd2-2eda05bc80c2} + + + {b320f6a3-36a4-4b22-8c21-da7d2e12211a} + + + {983480f9-7320-4c01-b926-ee8dead5b916} + + + + + packaging + + + + + resource + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Common.props b/builds/msvc/vs2010/properties/Common.props new file mode 100644 index 00000000..79b0b6c5 --- /dev/null +++ b/builds/msvc/vs2010/properties/Common.props @@ -0,0 +1,27 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Common Settings + Unicode + $(ProjectName) + + + + + true + + UNICODE;_UNICODE;%(PreprocessorDefinitions) + Level3 + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Console.props b/builds/msvc/vs2010/properties/Console.props new file mode 100644 index 00000000..84728193 --- /dev/null +++ b/builds/msvc/vs2010/properties/Console.props @@ -0,0 +1,21 @@ + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Application + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleDebugDynamic.props b/builds/msvc/vs2010/properties/ConsoleDebugDynamic.props new file mode 100644 index 00000000..c193c5e0 --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleDebugDynamic.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Debug Dynamic + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..51d58a70 --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props @@ -0,0 +1,22 @@ + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Debug Link Time Code Generation Library + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleDebugStatic.props b/builds/msvc/vs2010/properties/ConsoleDebugStatic.props new file mode 100644 index 00000000..019f74cd --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleDebugStatic.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Debug Static + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props b/builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props new file mode 100644 index 00000000..beacefae --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Release Dynamic + + + + + + MultiThreadedDebugDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..491419a8 --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Release Link Time Code Generation Library + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseStatic.props b/builds/msvc/vs2010/properties/ConsoleReleaseStatic.props new file mode 100644 index 00000000..3ada6cc5 --- /dev/null +++ b/builds/msvc/vs2010/properties/ConsoleReleaseStatic.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Release Static + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Debug.props b/builds/msvc/vs2010/properties/Debug.props new file mode 100644 index 00000000..7f060f47 --- /dev/null +++ b/builds/msvc/vs2010/properties/Debug.props @@ -0,0 +1,29 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Debug Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\ + + + + ProgramDatabase + EnableFastChecks + ProgramDatabase + true + Disabled + _DEBUG;%(PreprocessorDefinitions) + + + _DEBUG;%(PreprocessorDefinitions) + + + true + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Dynamic.props b/builds/msvc/vs2010/properties/Dynamic.props new file mode 100644 index 00000000..8f57f137 --- /dev/null +++ b/builds/msvc/vs2010/properties/Dynamic.props @@ -0,0 +1,19 @@ + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Library + + + + + _DLL;_WINDLL;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/DynamicDebug.props b/builds/msvc/vs2010/properties/DynamicDebug.props new file mode 100644 index 00000000..03954333 --- /dev/null +++ b/builds/msvc/vs2010/properties/DynamicDebug.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Debug Library + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/DynamicRelease.props b/builds/msvc/vs2010/properties/DynamicRelease.props new file mode 100644 index 00000000..1b1de610 --- /dev/null +++ b/builds/msvc/vs2010/properties/DynamicRelease.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Release Library + + + + + + MultiThreadedDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props new file mode 100644 index 00000000..338a9704 --- /dev/null +++ b/builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Link Time Code Generation Library + + + + + true + + + UseLinkTimeCodeGeneration + + + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Release.props b/builds/msvc/vs2010/properties/Release.props new file mode 100644 index 00000000..aff972fd --- /dev/null +++ b/builds/msvc/vs2010/properties/Release.props @@ -0,0 +1,41 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Release Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\ + false + + + + + /Oy- %(AdditionalOptions) + + true + true + OnlyExplicitInline + false + MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + + + NDEBUG;%(PreprocessorDefinitions) + + + true + + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib + true + + + + + + StreamingSIMDExtensions2 + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Static.props b/builds/msvc/vs2010/properties/Static.props new file mode 100644 index 00000000..9b30a132 --- /dev/null +++ b/builds/msvc/vs2010/properties/Static.props @@ -0,0 +1,19 @@ + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Library + + + + + _LIB;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/StaticDebug.props b/builds/msvc/vs2010/properties/StaticDebug.props new file mode 100644 index 00000000..b5e5ba9a --- /dev/null +++ b/builds/msvc/vs2010/properties/StaticDebug.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Debug Library + + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..ae5f3504 --- /dev/null +++ b/builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library + + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props new file mode 100644 index 00000000..8009311c --- /dev/null +++ b/builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props @@ -0,0 +1,18 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Link Time Code Generation Library + + + $(TargetName).ltcg + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/StaticRelease.props b/builds/msvc/vs2010/properties/StaticRelease.props new file mode 100644 index 00000000..d7a60580 --- /dev/null +++ b/builds/msvc/vs2010/properties/StaticRelease.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Release Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..668a9e9d --- /dev/null +++ b/builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Release Link Time Code Generation Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/Win32.props b/builds/msvc/vs2010/properties/Win32.props new file mode 100644 index 00000000..bc64e844 --- /dev/null +++ b/builds/msvc/vs2010/properties/Win32.props @@ -0,0 +1,21 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Win32 Settings + + + + + WIN32;_WIN32;%(PreprocessorDefinitions) + + + MachineX86 + + + /MACHINE:X86 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/properties/x64.props b/builds/msvc/vs2010/properties/x64.props new file mode 100644 index 00000000..1c750d62 --- /dev/null +++ b/builds/msvc/vs2010/properties/x64.props @@ -0,0 +1,24 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>x64 Settings + + + + + + WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions) + + + MachineX64 + + + /MACHINE:X64 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium.sln b/builds/msvc/vs2012/libsodium.sln new file mode 100644 index 00000000..b75f7732 --- /dev/null +++ b/builds/msvc/vs2012/libsodium.sln @@ -0,0 +1,50 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "libsodium\libsodium.vcxproj", "{A185B162-6CB6-4502-B03F-B56F7699A8D9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + DynDebug|Win32 = DynDebug|Win32 + DynDebug|x64 = DynDebug|x64 + DynRelease|Win32 = DynRelease|Win32 + DynRelease|x64 = DynRelease|x64 + LtcgDebug|Win32 = LtcgDebug|Win32 + LtcgDebug|x64 = LtcgDebug|x64 + LtcgRelease|Win32 = LtcgRelease|Win32 + LtcgRelease|x64 = LtcgRelease|x64 + StaticDebug|Win32 = StaticDebug|Win32 + StaticDebug|x64 = StaticDebug|x64 + StaticRelease|Win32 = StaticRelease|Win32 + StaticRelease|x64 = StaticRelease|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.Build.0 = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.ActiveCfg = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.Build.0 = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.Build.0 = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.Build.0 = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.Build.0 = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.ActiveCfg = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.Build.0 = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.Build.0 = ReleaseLIB|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/builds/msvc/vs2012/libsodium/libsodium.props b/builds/msvc/vs2012/libsodium/libsodium.props new file mode 100644 index 00000000..0b13e4bf --- /dev/null +++ b/builds/msvc/vs2012/libsodium/libsodium.props @@ -0,0 +1,32 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Libsodium Common Settings + AllRules.ruleset + false + + + + + $(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + 4146;4244;%(DisableSpecificWarnings) + false + inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + + + + SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + DLL_EXPORT;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj new file mode 100644 index 00000000..5025ee71 --- /dev/null +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -0,0 +1,372 @@ + + + + {A185B162-6CB6-4502-B03F-B56F7699A8D9} + libsodium + libsodium11 + + + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + DebugDLL + x64 + + + ReleaseDLL + x64 + + + DebugLTCG + Win32 + + + ReleaseLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + x64 + + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + + + + v110 + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters new file mode 100644 index 00000000..805f7e01 --- /dev/null +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters @@ -0,0 +1,591 @@ + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + resource + + + + + packaging + + + packaging + + + packaging + + + packaging + + + packaging + + + + + {03c1f568-fa7f-499c-a616-a8e0f5050b97} + + + {ddaca9ce-4d7d-4395-bfd2-2eda05bc80c2} + + + {b320f6a3-36a4-4b22-8c21-da7d2e12211a} + + + {983480f9-7320-4c01-b926-ee8dead5b916} + + + + + packaging + + + + + resource + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Common.props b/builds/msvc/vs2012/properties/Common.props new file mode 100644 index 00000000..79b0b6c5 --- /dev/null +++ b/builds/msvc/vs2012/properties/Common.props @@ -0,0 +1,27 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Common Settings + Unicode + $(ProjectName) + + + + + true + + UNICODE;_UNICODE;%(PreprocessorDefinitions) + Level3 + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Console.props b/builds/msvc/vs2012/properties/Console.props new file mode 100644 index 00000000..84728193 --- /dev/null +++ b/builds/msvc/vs2012/properties/Console.props @@ -0,0 +1,21 @@ + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Application + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleDebugDynamic.props b/builds/msvc/vs2012/properties/ConsoleDebugDynamic.props new file mode 100644 index 00000000..c193c5e0 --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleDebugDynamic.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Debug Dynamic + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..51d58a70 --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props @@ -0,0 +1,22 @@ + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Debug Link Time Code Generation Library + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleDebugStatic.props b/builds/msvc/vs2012/properties/ConsoleDebugStatic.props new file mode 100644 index 00000000..019f74cd --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleDebugStatic.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Debug Static + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props b/builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props new file mode 100644 index 00000000..beacefae --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Release Dynamic + + + + + + MultiThreadedDebugDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/ConsoleReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..491419a8 --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Release Link Time Code Generation Library + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ConsoleReleaseStatic.props b/builds/msvc/vs2012/properties/ConsoleReleaseStatic.props new file mode 100644 index 00000000..3ada6cc5 --- /dev/null +++ b/builds/msvc/vs2012/properties/ConsoleReleaseStatic.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Release Static + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Debug.props b/builds/msvc/vs2012/properties/Debug.props new file mode 100644 index 00000000..7f060f47 --- /dev/null +++ b/builds/msvc/vs2012/properties/Debug.props @@ -0,0 +1,29 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Debug Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\ + + + + ProgramDatabase + EnableFastChecks + ProgramDatabase + true + Disabled + _DEBUG;%(PreprocessorDefinitions) + + + _DEBUG;%(PreprocessorDefinitions) + + + true + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Dynamic.props b/builds/msvc/vs2012/properties/Dynamic.props new file mode 100644 index 00000000..8f57f137 --- /dev/null +++ b/builds/msvc/vs2012/properties/Dynamic.props @@ -0,0 +1,19 @@ + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Library + + + + + _DLL;_WINDLL;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/DynamicDebug.props b/builds/msvc/vs2012/properties/DynamicDebug.props new file mode 100644 index 00000000..03954333 --- /dev/null +++ b/builds/msvc/vs2012/properties/DynamicDebug.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Debug Library + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/DynamicRelease.props b/builds/msvc/vs2012/properties/DynamicRelease.props new file mode 100644 index 00000000..1b1de610 --- /dev/null +++ b/builds/msvc/vs2012/properties/DynamicRelease.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Release Library + + + + + + MultiThreadedDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props new file mode 100644 index 00000000..338a9704 --- /dev/null +++ b/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Link Time Code Generation Library + + + + + true + + + UseLinkTimeCodeGeneration + + + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Release.props b/builds/msvc/vs2012/properties/Release.props new file mode 100644 index 00000000..aff972fd --- /dev/null +++ b/builds/msvc/vs2012/properties/Release.props @@ -0,0 +1,41 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Release Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\ + false + + + + + /Oy- %(AdditionalOptions) + + true + true + OnlyExplicitInline + false + MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + + + NDEBUG;%(PreprocessorDefinitions) + + + true + + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib + true + + + + + + StreamingSIMDExtensions2 + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Static.props b/builds/msvc/vs2012/properties/Static.props new file mode 100644 index 00000000..9b30a132 --- /dev/null +++ b/builds/msvc/vs2012/properties/Static.props @@ -0,0 +1,19 @@ + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Library + + + + + _LIB;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/StaticDebug.props b/builds/msvc/vs2012/properties/StaticDebug.props new file mode 100644 index 00000000..b5e5ba9a --- /dev/null +++ b/builds/msvc/vs2012/properties/StaticDebug.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Debug Library + + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..ae5f3504 --- /dev/null +++ b/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library + + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props new file mode 100644 index 00000000..8009311c --- /dev/null +++ b/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props @@ -0,0 +1,18 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Link Time Code Generation Library + + + $(TargetName).ltcg + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/StaticRelease.props b/builds/msvc/vs2012/properties/StaticRelease.props new file mode 100644 index 00000000..d7a60580 --- /dev/null +++ b/builds/msvc/vs2012/properties/StaticRelease.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Release Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/StaticReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..668a9e9d --- /dev/null +++ b/builds/msvc/vs2012/properties/StaticReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Release Link Time Code Generation Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Win32.props b/builds/msvc/vs2012/properties/Win32.props new file mode 100644 index 00000000..bc64e844 --- /dev/null +++ b/builds/msvc/vs2012/properties/Win32.props @@ -0,0 +1,21 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Win32 Settings + + + + + WIN32;_WIN32;%(PreprocessorDefinitions) + + + MachineX86 + + + /MACHINE:X86 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/x64.props b/builds/msvc/vs2012/properties/x64.props new file mode 100644 index 00000000..1c750d62 --- /dev/null +++ b/builds/msvc/vs2012/properties/x64.props @@ -0,0 +1,24 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>x64 Settings + + + + + + WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions) + + + MachineX64 + + + /MACHINE:X64 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium.import.props b/builds/msvc/vs2013/libsodium.import.props new file mode 100644 index 00000000..099e7939 --- /dev/null +++ b/builds/msvc/vs2013/libsodium.import.props @@ -0,0 +1,80 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Libsodium Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + + + + + + SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.imp.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.imp.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.ltcg.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.ltcg.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium.import.xml b/builds/msvc/vs2013/libsodium.import.xml new file mode 100644 index 00000000..14aa587d --- /dev/null +++ b/builds/msvc/vs2013/libsodium.import.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium.sln b/builds/msvc/vs2013/libsodium.sln index cbc694f1..8849e449 100644 --- a/builds/msvc/vs2013/libsodium.sln +++ b/builds/msvc/vs2013/libsodium.sln @@ -5,6 +5,11 @@ VisualStudioVersion = 12.0.30110.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "libsodium\libsodium.vcxproj", "{A185B162-6CB6-4502-B03F-B56F7699A8D9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{4EDBA07C-2F08-4C9E-805F-A4921814C117}" + ProjectSection(ProjectDependencies) = postProject + {A185B162-6CB6-4502-B03F-B56F7699A8D9} = {A185B162-6CB6-4502-B03F-B56F7699A8D9} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution DynDebug|Win32 = DynDebug|Win32 @@ -45,6 +50,30 @@ Global {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.Build.0 = ReleaseLIB|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|Win32.Build.0 = DebugDEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|x64.ActiveCfg = DebugDEXE|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynDebug|x64.Build.0 = DebugDEXE|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.DynRelease|x64.Build.0 = ReleaseDEXE|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgDebug|x64.Build.0 = DebugLEXE|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticDebug|x64.Build.0 = DebugSEXE|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64 + {4EDBA07C-2F08-4C9E-805F-A4921814C117}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/builds/msvc/vs2013/libsodium/libsodium.props b/builds/msvc/vs2013/libsodium/libsodium.props index 68ba9e35..0b13e4bf 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.props +++ b/builds/msvc/vs2013/libsodium/libsodium.props @@ -9,20 +9,12 @@ - $(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) 4146;4244;%(DisableSpecificWarnings) false inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index cfb372ac..cb6f6c36 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -229,6 +229,10 @@ + + + true + @@ -266,6 +270,10 @@ + + + true + diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters index 805f7e01..260afb56 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters @@ -391,6 +391,12 @@ src + + src + + + src + diff --git a/builds/msvc/vs2013/properties/Console.props b/builds/msvc/vs2013/properties/Console.props new file mode 100644 index 00000000..84728193 --- /dev/null +++ b/builds/msvc/vs2013/properties/Console.props @@ -0,0 +1,21 @@ + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Application + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleDebugDynamic.props b/builds/msvc/vs2013/properties/ConsoleDebugDynamic.props new file mode 100644 index 00000000..c193c5e0 --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleDebugDynamic.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Debug Dynamic + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..51d58a70 --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props @@ -0,0 +1,22 @@ + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Debug Link Time Code Generation Library + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleDebugStatic.props b/builds/msvc/vs2013/properties/ConsoleDebugStatic.props new file mode 100644 index 00000000..019f74cd --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleDebugStatic.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Debug Static + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props b/builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props new file mode 100644 index 00000000..beacefae --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Release Dynamic + + + + + + MultiThreadedDebugDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/ConsoleReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..491419a8 --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Release Link Time Code Generation Library + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/ConsoleReleaseStatic.props b/builds/msvc/vs2013/properties/ConsoleReleaseStatic.props new file mode 100644 index 00000000..3ada6cc5 --- /dev/null +++ b/builds/msvc/vs2013/properties/ConsoleReleaseStatic.props @@ -0,0 +1,20 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Console Release Static + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/test/test.props b/builds/msvc/vs2013/test/test.props new file mode 100644 index 00000000..7e33471e --- /dev/null +++ b/builds/msvc/vs2013/test/test.props @@ -0,0 +1,51 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Libsodium Test Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\..\..\test\default\;$(ProjectDir)..\..\..\..\test\quirks\;%(AdditionalIncludeDirectories) + + false + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + + + + + SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + + + + + + dynamic + + + ltcg + + + static + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/test/test.runner.bat b/builds/msvc/vs2013/test/test.runner.bat new file mode 100644 index 00000000..cd7e7914 --- /dev/null +++ b/builds/msvc/vs2013/test/test.runner.bat @@ -0,0 +1,78 @@ +REM WORK IN PROGRESS + +@ECHO OFF + +if "%1" == "" ( + echo "Usage: wintest.bat NUL 2>&1 + if not exist %%f.exe ( + echo %%f compile failed + goto :END + ) + %%f.exe + if errorlevel 1 ( + echo %%f failed + ) else ( + echo %%f ok + ) +) +REM Remove temporary files +del *.exe *.obj *.res *.exp *.pdb + +:END diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj new file mode 100644 index 00000000..59a61deb --- /dev/null +++ b/builds/msvc/vs2013/test/test.vcxproj @@ -0,0 +1,288 @@ + + + + {4EDBA07C-2F08-4C9E-805F-A4921814C117} + test + test12 + + + v120 + Application + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DebugDEXE + Win32 + + + ReleaseDEXE + Win32 + + + DebugDEXE + x64 + + + ReleaseDEXE + x64 + + + DebugLEXE + Win32 + + + ReleaseLEXE + Win32 + + + DebugLEXE + x64 + + + ReleaseLEXE + x64 + + + DebugSEXE + Win32 + + + ReleaseSEXE + Win32 + + + DebugSEXE + x64 + + + ReleaseSEXE + x64 + + + + + false + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + + true + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + + true + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/test/test.vcxproj.filters b/builds/msvc/vs2013/test/test.vcxproj.filters new file mode 100644 index 00000000..a58b55c5 --- /dev/null +++ b/builds/msvc/vs2013/test/test.vcxproj.filters @@ -0,0 +1,162 @@ + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + include + + + include + + + + + {705beade-aa7f-49c0-900e-4b0cbbdc2f7b} + + + {5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea} + + + \ No newline at end of file diff --git a/test/default/auth.exp b/test/default/auth.exp deleted file mode 100644 index 35e5909d..00000000 --- a/test/default/auth.exp +++ /dev/null @@ -1,4 +0,0 @@ -,0x16,0x4b,0x7a,0x7b,0xfc,0xf8,0x19,0xe2 -,0xe3,0x95,0xfb,0xe7,0x3b,0x56,0xe0,0xa3 -,0x87,0xbd,0x64,0x22,0x2e,0x83,0x1f,0xd6 -,0x10,0x27,0x0c,0xd7,0xea,0x25,0x05,0x54 diff --git a/test/default/auth2.exp b/test/default/auth2.exp deleted file mode 100644 index 955951a2..00000000 --- a/test/default/auth2.exp +++ /dev/null @@ -1,4 +0,0 @@ -,0x37,0x2e,0xfc,0xf9,0xb4,0x0b,0x35,0xc2 -,0x11,0x5b,0x13,0x46,0x90,0x3d,0x2e,0xf4 -,0x2f,0xce,0xd4,0x6f,0x08,0x46,0xe7,0x25 -,0x7b,0xb1,0x56,0xd3,0xd7,0xb3,0x0d,0x3f diff --git a/test/default/auth3.exp b/test/default/auth3.exp deleted file mode 100644 index 573541ac..00000000 --- a/test/default/auth3.exp +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/test/default/auth5.exp b/test/default/auth5.exp deleted file mode 100644 index e69de29b..00000000 diff --git a/test/default/box.exp b/test/default/box.exp deleted file mode 100644 index 2b6c51ea..00000000 --- a/test/default/box.exp +++ /dev/null @@ -1,19 +0,0 @@ -,0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5 -,0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9 -,0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73 -,0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce -,0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4 -,0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a -,0xc0,0xdf,0xc1,0x7c,0x98,0xdc,0xe8,0x7b -,0x4d,0xa7,0xf0,0x11,0xec,0x48,0xc9,0x72 -,0x71,0xd2,0xc2,0x0f,0x9b,0x92,0x8f,0xe2 -,0x27,0x0d,0x6f,0xb8,0x63,0xd5,0x17,0x38 -,0xb4,0x8e,0xee,0xe3,0x14,0xa7,0xcc,0x8a -,0xb9,0x32,0x16,0x45,0x48,0xe5,0x26,0xae -,0x90,0x22,0x43,0x68,0x51,0x7a,0xcf,0xea -,0xbd,0x6b,0xb3,0x73,0x2b,0xc0,0xe9,0xda -,0x99,0x83,0x2b,0x61,0xca,0x01,0xb6,0xde -,0x56,0x24,0x4a,0x9e,0x88,0xd5,0xf9,0xb3 -,0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6 -,0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74 -,0xe3,0x55,0xa5 diff --git a/test/default/box2.exp b/test/default/box2.exp deleted file mode 100644 index c61d4557..00000000 --- a/test/default/box2.exp +++ /dev/null @@ -1,17 +0,0 @@ -,0xbe,0x07,0x5f,0xc5,0x3c,0x81,0xf2,0xd5 -,0xcf,0x14,0x13,0x16,0xeb,0xeb,0x0c,0x7b -,0x52,0x28,0xc5,0x2a,0x4c,0x62,0xcb,0xd4 -,0x4b,0x66,0x84,0x9b,0x64,0x24,0x4f,0xfc -,0xe5,0xec,0xba,0xaf,0x33,0xbd,0x75,0x1a -,0x1a,0xc7,0x28,0xd4,0x5e,0x6c,0x61,0x29 -,0x6c,0xdc,0x3c,0x01,0x23,0x35,0x61,0xf4 -,0x1d,0xb6,0x6c,0xce,0x31,0x4a,0xdb,0x31 -,0x0e,0x3b,0xe8,0x25,0x0c,0x46,0xf0,0x6d -,0xce,0xea,0x3a,0x7f,0xa1,0x34,0x80,0x57 -,0xe2,0xf6,0x55,0x6a,0xd6,0xb1,0x31,0x8a -,0x02,0x4a,0x83,0x8f,0x21,0xaf,0x1f,0xde -,0x04,0x89,0x77,0xeb,0x48,0xf5,0x9f,0xfd -,0x49,0x24,0xca,0x1c,0x60,0x90,0x2e,0x52 -,0xf0,0xa0,0x89,0xbc,0x76,0x89,0x70,0x40 -,0xe0,0x82,0xf9,0x37,0x76,0x38,0x48,0x64 -,0x5e,0x07,0x05 diff --git a/test/default/box7.exp b/test/default/box7.exp deleted file mode 100644 index e69de29b..00000000 diff --git a/test/default/box8.exp b/test/default/box8.exp deleted file mode 100644 index e69de29b..00000000 diff --git a/test/default/box_easy.exp b/test/default/box_easy.exp deleted file mode 100644 index 2b6c51ea..00000000 --- a/test/default/box_easy.exp +++ /dev/null @@ -1,19 +0,0 @@ -,0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5 -,0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9 -,0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73 -,0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce -,0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4 -,0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a -,0xc0,0xdf,0xc1,0x7c,0x98,0xdc,0xe8,0x7b -,0x4d,0xa7,0xf0,0x11,0xec,0x48,0xc9,0x72 -,0x71,0xd2,0xc2,0x0f,0x9b,0x92,0x8f,0xe2 -,0x27,0x0d,0x6f,0xb8,0x63,0xd5,0x17,0x38 -,0xb4,0x8e,0xee,0xe3,0x14,0xa7,0xcc,0x8a -,0xb9,0x32,0x16,0x45,0x48,0xe5,0x26,0xae -,0x90,0x22,0x43,0x68,0x51,0x7a,0xcf,0xea -,0xbd,0x6b,0xb3,0x73,0x2b,0xc0,0xe9,0xda -,0x99,0x83,0x2b,0x61,0xca,0x01,0xb6,0xde -,0x56,0x24,0x4a,0x9e,0x88,0xd5,0xf9,0xb3 -,0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6 -,0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74 -,0xe3,0x55,0xa5 diff --git a/test/default/box_easy2.exp b/test/default/box_easy2.exp deleted file mode 100644 index 573541ac..00000000 --- a/test/default/box_easy2.exp +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/test/default/cmptest.h b/test/default/cmptest.h index 477abcbd..bb2bd9a4 100644 --- a/test/default/cmptest.h +++ b/test/default/cmptest.h @@ -6,6 +6,10 @@ #include "sodium.h" +#ifndef TEST_SRCDIR +#define TEST_SRCDIR "./" +#endif + #define TEST_NAME_RES TEST_NAME ".res" #define TEST_NAME_OUT TEST_SRCDIR "/" TEST_NAME ".exp" diff --git a/test/default/core1.exp b/test/default/core1.exp deleted file mode 100644 index 715a489d..00000000 --- a/test/default/core1.exp +++ /dev/null @@ -1,4 +0,0 @@ - 0x1b,0x27,0x55,0x64,0x73,0xe9,0x85,0xd4 -,0x62,0xcd,0x51,0x19,0x7a,0x9a,0x46,0xc7 -,0x60,0x09,0x54,0x9e,0xac,0x64,0x74,0xf2 -,0x06,0xc4,0xee,0x08,0x44,0xf6,0x83,0x89 diff --git a/test/default/core2.exp b/test/default/core2.exp deleted file mode 100644 index f4682af0..00000000 --- a/test/default/core2.exp +++ /dev/null @@ -1,4 +0,0 @@ - 0xdc,0x90,0x8d,0xda,0x0b,0x93,0x44,0xa9 -,0x53,0x62,0x9b,0x73,0x38,0x20,0x77,0x88 -,0x80,0xf3,0xce,0xb4,0x21,0xbb,0x61,0xb9 -,0x1c,0xbd,0x4c,0x3e,0x66,0x25,0x6c,0xe4 diff --git a/test/default/core3.exp b/test/default/core3.exp deleted file mode 100644 index 5fa208c1..00000000 --- a/test/default/core3.exp +++ /dev/null @@ -1 +0,0 @@ -662b9d0e3463029156069b12f918691a98f7dfb2ca0393c96bbfc6b1fbd630a2 diff --git a/test/default/core4.exp b/test/default/core4.exp deleted file mode 100644 index d04e5b5e..00000000 --- a/test/default/core4.exp +++ /dev/null @@ -1,8 +0,0 @@ - 69, 37, 68, 39, 41, 15,107,193 -,255,139,122, 6,170,233,217, 98 -, 89,144,182,106, 21, 51,200, 65 -,239, 49,222, 34,215,114, 40,126 -,104,197, 7,225,197,153, 31, 2 -,102, 78, 76,176, 84,245,246,184 -,177,160,133,130, 6, 72,149,119 -,192,195,132,236,234,103,246, 74 diff --git a/test/default/core5.exp b/test/default/core5.exp deleted file mode 100644 index 562cf717..00000000 --- a/test/default/core5.exp +++ /dev/null @@ -1,4 +0,0 @@ -,0xbc,0x1b,0x30,0xfc,0x07,0x2c,0xc1,0x40 -,0x75,0xe4,0xba,0xa7,0x31,0xb5,0xa8,0x45 -,0xea,0x9b,0x11,0xe9,0xa5,0x19,0x1f,0x94 -,0xe1,0x8c,0xba,0x8f,0xd8,0x21,0xa7,0xcd diff --git a/test/default/core6.exp b/test/default/core6.exp deleted file mode 100644 index 562cf717..00000000 --- a/test/default/core6.exp +++ /dev/null @@ -1,4 +0,0 @@ -,0xbc,0x1b,0x30,0xfc,0x07,0x2c,0xc1,0x40 -,0x75,0xe4,0xba,0xa7,0x31,0xb5,0xa8,0x45 -,0xea,0x9b,0x11,0xe9,0xa5,0x19,0x1f,0x94 -,0xe1,0x8c,0xba,0x8f,0xd8,0x21,0xa7,0xcd diff --git a/test/default/generichash.exp b/test/default/generichash.exp deleted file mode 100644 index 1840ff24..00000000 --- a/test/default/generichash.exp +++ /dev/null @@ -1,64 +0,0 @@ -05 -5d8c -22221b -d4974470 -be8492fb36 -edc178279907 -26848f2ae0c2e6 -045cf1235112b9f6 -5110bad569356dfa6c -1339d95145bc8a33d3aa -3dbb39b4d57c5566808a88 -22378260939cee01022686a2 -e18b37abcead6cc520e6504dac -3cbb356604cf862e62ad2f534323 -44c41ba227b191961b475ec5875057 -0c7c9c3922d41a7b2b3b20f92685d560 -8508c01d19709bdd881866aa1f8c63ca06 -f6b2dddfbece6d7d52e114c7e5a97772e18d -d36b5af9591d0cd3747254e26bc6e1de5b6081 -f7f7ce69149418d7ec33327bd86e14bcca4b8ed7 -2c9aba9a56de21165753c4f3cee9310a9c8fe546b9 -ee5e08cee5fbbcb51900341bb30db6695920faecda6a -fe9ffb56dc5716b91bc7d77ce7b05e7cc39c31683bec91 -c500ae0f5bff0f1106ce104ae9c291add7207e0d8ebcb1ed -68e23d12000b387158afd6458d3bcef9c26936ca68b5c0f3d6 -220efa2c09f67dbb02aa623bbc0cb92107a30f53b633e78d4b44 -54df984b47e4bcd489d9c045c488743fac91c9b3e0cbcc37495fac -b4852cf66c6ce164c002bbb62ded0faeb4a39c39fdffb372ff14dd31 -d79cafb5565e7775616e1c9b09100d61fb71efaf25affcf2d480d2c980 -ae557883145e374adef583ba0550429d5cdd86b254c33bf52d02e070efda -9f53d28c0df7b327c2eb4c8a12c742829225b7f30fda7baf64135098fdb01b -a9f51bb7f6a3e9cdb96ce652c07d177962a348a9cced1b92f948187e59b44463 -f2960cf5fd57fc92f549cd5a2803147964f60e7703e1b8897c088cded74c7bd39f -89981acbb690eb03ed2a67510d1d85a1b4f9d496fdfe134550ae14146bb05fd5fedd -6d8245383fd7c418b46511339e711b9d4a0d1f5fdf6de45fdd3d0664164b7bf878a124 -1f0b6b083d524e0741710ddef499ce88f51083bb3ad80a1815cc57acf006436e9b6ad72b -fc35bfe34c915020bb8b44fa0a19933774eaaf61919780fd55564e085bc31646dfc1d426e9 -117d58f1f8cb2c036102686035975be90550795e5a0e3469a8f7a2cba9bc88961852b18c8ae3 -c679c950818729c799bb7f39cef2d89fa80a147817f379a073ef1ccafea5d369815c70373bf5be -d487ad2143024ee8c645a066c035b74abe3a11f1c9fcd738b154b8ca37134d74fb78c40d1a2274cf -2d3ee00828b0ccea6812b40f214fab6d4f23f7e74ae228115bcb208ced2d5e1cb9cdff41de912af7a8 -a697b26d4c4475e312288b98ae2ec4954d3c74c8e144c0ab518616ff9f52918a946fd765af75e761178c -f647bcba2a711f431d6d453aa7d75dcf5bb9ab6f8b83f89117230f633e7580f27c71c4f4c211cadd04f587 -1fc1d6a4db753e2f4fd1456b2b709dd70ad58547eeda9d5a55762b5cd4097a7a1bd73cc633ec27168ee65631 -1cfe0f63ab155379b4a1b5bf694a33635097b8e4b6dbd3b983d62454d36d7bf4550bece301abdd27b2dd76ca9f -73dee8a0a558e7b6f6eefe411280e253b05ef006d499849fea5d6a95f9141ee160322fff3a3f70e10c84025e02ce -edf9e706f4acae4f4bed72404f14458ba075d2b9d9a4a1ed46d1f1c5e23113a74cce9f7735432a922a3d8097f22c7a -95d5cd54c6722ac4335fa0ab38d388c9fd0baea48a9078605e400534ef38f13abb1d770da84b90b0256e1c1b64f54ba9 -fe6b85ee8b5eb7da035264ed46e6dcd948571018d1f6976de4102fcb4bb5f1422e7df1b5aaa5b6b56c5961966db29ead6e -499ab83c01e4bf74ea5036392f9f810eae8a066fff49e316e4288baccb2001efa24f64cef7bfae70c90f139b198e53ad87f1 -eac6c9d97264241a8adba22ee925438ed9787a547018608a10676a7594bc51c60294bd9159fbcada9022b44880a37c5b07c1b4 -0771e3ae24bbfe424800d4bae776fef3da1607990019e7c4b30bc8140061ebf0b64aad7b018a878d579caa67154b98a04402735e -d569e5f5fe197387451441911a2be2effa606dad39820af44cea056bd9d1499dde41fa1c6c3a0459d5866c944bec2ac83328953726 -68e523ded865c4d8318d61c312189a59597bbc3995e312e85137611af761a5f73508ac79e359edf729d4508830fc642b432f09185914 -601af664ae596166707244adbb4f704593b355c6a659c844d853c6647fb265cdbcea26ed43657251dec37f2d6453fa0ace55f22d303cb0 -703d8e552236b2090143444545f0a61a809d8ef9843bcf6883f61671fb31c8d6ac9fd373e7f9f79a0c72fa6a37dc655ba1fb01a5f41e36d1 -03896f594afd1bf97acb862106eb05a1d8b54ec08d184812a79f4dc7b287a7486e60927b6c23e5f51fcbc94798648b28fd13438300567bec95 -cc66a891768e95a2717b040c111996f14942f10f2475c33aa5f1c97476e6f8386733d6b21c16102d01ff1f715475f01099e1f19aa763238a38a9 -007aac8eae29e5bf2be1b54857f5fe80c324424a3273b46e55482fbc4ae1033df4a97016b60c81a5344abd6366f56d8cee2c2e94619418293990de -50c81e92605a6111ea4c7c602acfb3945d4c2631c8c08fa4b594134577f5c2ffcca90d48604162cfdb2a0bb40416ff9134a275461b829ff1b875f995 -661b7a1c70170aa7559aa82639fa65c1bdcfb5e336cb23b40a9edf5b4f6eeca1a176a9844da705cafb990dd94b9dc6194eb6b2de3eca9dbd255bb267a1 -9ff11c233aaf5e0242b0dbe6e110a42e58b86141ad0ef130fd2bb895700019782de66d435bf0a8d6f5eda5d7d1105e7a6f3ef17a9da8f9c16fc21075431a -bdd3d0fafe8ba2b29d1ac0b79aa46e249cc9d3a82d0f772d690637bbdd353722356658d00436ff5dd5239ab747979329345eb8c7ed11b7331456ae87350fcf -bd965bf31e87d70327536f2a341cebc4768eca275fa05ef98f7f1b71a0351298de006fba73fe6733ed01d75801b4a928e54231b38e38c562b2e33ea1284992fa diff --git a/test/default/generichash2.exp b/test/default/generichash2.exp deleted file mode 100644 index 5ee6f605..00000000 --- a/test/default/generichash2.exp +++ /dev/null @@ -1,64 +0,0 @@ -05 -22a8 -287a9d -d8eeab1c -d4ce34973f -584f7ac46f0c -32c848bb67545b -8438e21361bca125 -27a6faae998b4fabb4 -508c05a4f2daee150bad -68c886c97dce370e8c72fa -d41e90824ace31ba7bf512ac -6e0d7a1e2b92a68e45ea867895 -1fc5ee8715312db38da9066152a5 -3138504ba58fcd56c62752bc98a6d2 -b689ecd5357cb5276007627fbdf4082e -afe251881beb8b9dfa3d4f76aafc7b2995 -980eaa215cb0911027c5564db809bb8ac0a1 -56048436883efdfc8feaa239d960fa5ce24d42 -fce905b6d57fd841f58899a77887a4988e6aa2d1 -6f7afd81d24ccf4d98188b71bdbb7e6c637620879b -50406b4c37b48621505942b35dff30a75f7d2868146b -32c21792e18e7a79a4a20ef291721d7eab4e4cf99fbe79 -4b9d9ac5dbfb825acd87588667e6683e0fde4cdcd0a532f9 -2b55a3ebb461623e5de4fbacfb8b26819cfa8adeb094c8c13b -4c7d261780b25a864a008352ad64d1ae7fc21d608317813cf63f -f0ca06b8e12c48f1511d0991ba562f06dbe6ba6d5e18280224cc6a -838a5f7056bfbca65a245796dd3510cb07ff1614b44989d91ac650b2 -a58a8da276577160441f8b9e9c52a041b7caf7cd316acc506f620ab0e1 -e03940a7231049ff2b86c47a28e4951f105d2a3aa3421190fe0ed6aa4ad6 -a7af977c0b34294b1a03d0cc2dcf6eb72f9a32721c3f70128384aeb1f56047 -0e5625d74ada70b8a3b23ca76894e9a0f9dee88f5e3e370e27ad25061ea9dd6f -775fd9257b265997a16557a445985091798af60e68d06e3ae8e2e886d23ed12f6e -852e8d4208166a990e215ed06b86c708f491e014584ac9b08f97f24d9f08a84c8e83 -fbdca0db9a933fcffcce2ae694d7e16e7571b100564fcb3d69cec82ea42f254a493a32 -50530ae5eb9780f3fafc5d179f7b363a0d69314a8545d68588b5fec28c8e8d1a011857f6 -5eb71553ff1ac4aba3f84faeb70281c738e3428aae68edc9842ebf55ffd7184a015e323445 -39b279c6d9cca89f8052f953abf71041faf3491b2b965cef503d715e8bf339e02a58fd0e0fba -e315bef5f4918e881dc8d39d3c6b3948c2ea8e21ac00ee7c7ab875a53e194add0c3d9b8bcba5b2 -4e950f0e1da3111d054136fbdf10b4b88b20de6ad0c6bd5024a5e0a8b4cd7059685c0b663a00cbfa -b1ed8d99fd62a4f504ecdd58a01759a85932a7783f88f314cdca5019e05063dcc1fcb3c39b8c07758e -e4d78e734b0cb5bbd83e22bc67f97bbc8a3644f789f6c26a3ec2fe72c75b4d48a3bc000e6f2f2f0726fe -162e01beb796433a2771eab54611fc93677ed12c73a93ea4d75e148bec7ab14b3e31ab7f395456fb2b47ab -759c30631fd52e80a22f0614125dcd136287db65079908b75fb5b03be1cdf6dd0a1c9de0cc759cdd82c33758 -af2992acdaf0908f03a2025854de6446123c919b1e24db711df6cb070091343b4e6f5b2716c20c2547f50f1fde -b833064955778a611fe41a9f1a2de730a16fb4e61a7e2fb67425ce199101d4e71dd7b0c731ea4188e9cc30e9bc52 -e546ee327168d9b4e0d73d9a043f9ef03f880bc8aee91b0923704eb7361ac916b00f5c71c872e2f911a77ef76704b5 -83d86f056729fa1a6e1d3fe8c3d2ebe42b327025747f2e6ba923d2b7b893e31571839937222852033844e585b17d462f -5d70402524fbef569552a3ff6854087e090ff9ac9ea03aba92cf9f33a28845fa6a1631090dca10e05cdd3341b391a15fcf -64f4d3ebf0717900f7c04512d1e18f9985975991d4254d76c4e2ee02c0edd6f912f715991984731b808b8370be1f201e53bf -7d45eae6626dfc9ec3591764b8c39c72ca67e6c1893ab590963a75922719937d1d0ff188a510ffbdf9c777a4d565b3683cbf38 -68e007db5067874548c0d12a9ca709221f9bd352e3eb9847fde6c5de4a8550f4b85b67fe4e5aad70626ebb27d71e5b528effb2e6 -b0dc4dc0bd0d41a8ccfa45a127542079bc4e6f63a63863a9ce21f44481d23eff1060ea03851759b9317209405d5b7cc4387cc2759b -adf6a9df484e93eb3a6113c3fd68a49b2166878fc652833c9cbef3fd8dd281d385ad0374bc25bc865b216ca395e21c30b9eda1d58a8d -f1df9bc169323da338daa8a94867db96a1a2a6feb26569198fb4591ae602ba6f766a879e745d71e93b6cb8886b914f2bf4aa55d4c48045 -0c7446078a5077f33bba1ebfad60bbf1b1df47aab2eb3f3f3274ce56ead7800cf095af8208b6d570c4c832fe33227bbbc0842a13e1e82ad9 -accd0b4682e56698ecc55a60a8db8b3f950b6bffc5a1d160daf6ca25e13e3b4983ced5903df0bdc21f70c2ec5adb1a2ec9617df645cdd17ac9 -b787bae190ff2608eb383e0299cc10d6b7232de67ab74285e7bfa933d79f91226066537d74a9d40140d7b1683c2d42cd1935f6430cc554db2b69 -d09b717a0c80f581c07b8813e0ae79cec2188f77122f7477954610655a20420f13eb1b68cacde8c1fdf7a9a398efa72f40c85f0122812eaa33aba0 -87fff156d9895917468e92848fdcfacc134ca3bfc7fce484bd6db41c682ee2ee47151df0fa863d5641633d908c0328e6cbe080e80d8293530ffd2c4f -1b17b2c0e7afcd224ec9bbe9ce9a13a00bd0a336b863f1b4d5304043778244323bd23fb6154a2e1e94aa48f6ff0e12787a50ca09e9e72ece9e038f6218 -23ac1ccd5e7df51b65b284650158d662e7ef51ebae01b879f39cec484b688c792f8e854bd8ca31ffe8796d28f10e49ab402dab47878a21cb95556dc32b0a -f8f5323ebcc28bf927e72d342b5b70d80ba67794afb4c28debad21b0dae24c7a9252e862eb4b83bea6d9c0bb7c108983c987f13d73f250c7f14483f0454a24 -55b97ca594d68ccf69a0a93fe7fa4004c7e2947a8cac4ca4a44e17ac6876f472e3f221b341a28004cd35a79cfad7fabb9378ce5af03e4c0445ebbe9540943bbd diff --git a/test/default/generichash3.exp b/test/default/generichash3.exp deleted file mode 100644 index f81d8e22..00000000 --- a/test/default/generichash3.exp +++ /dev/null @@ -1,64 +0,0 @@ -ba -6139 -3a1666 -5797e9d0 -834a26efe6 -d7e9e862bbce -40d8b84c374750 -276789189244cf04 -16f73ffe0673cc9992 -b3835bfaf6eb71d94078 -8c624e844d34f4a59f34cc -e0a394962413ad09975df3cf -47f043c3aacb501f97e0458ae3 -b4a11f2fb72a7e6f96fdacf98d49 -f434079e9adeb244047cb6855f9854 -5fbe885c4b2d4e0d78dc5905622a277a -e262ba3e2ab76efdf83513108e3b987d1b -add93dde78d32e77bc039c34a49043f19d26 -093842ac10e2eb1237ddc9ca9e7990cf397772 -09e7f6a0e2ea4888f1dbf6562effd1561c65029c -bd33a9ec914f5b81864a49184338e4062d6c6b2b2e -8dc46295235d94f5881d429a5ad47f9db9e35cf8c6b3 -ba5df554dca7ac1cba4889fa88adf3070fbf4ab5d187b5 -1ff84715e71c66214d271d421395fb6166db97b1d47ed697 -75a0d227c70549f5b0c933b7b21f151355bd47e04b6085c91f -a32a5c9439a0fa771dcbe7f338b5dcef62a754edc4952614d6f0 -53a87de519cdcc7f64730d58bce6baaf7b44c5c428a4611a208ad4 -5e5ad8f0c4f083f9b7a5154d9c0dfd0f3d2fce94cf54fc215450314a -9c76b9e63c77e6564b1e5111c2fb140046e1e5a4f900a7cfc2bac3fcfa -bb919251ca310eb9b994e5d7883bc9fa2144b59b8d5d940677b7130ac777 -faa492a66f08ef0c7adb868fcb7b523aedd35b8ff1414bd1d554794f144474 -9b273ebe335540b87be899abe169389ed61ed262c3a0a16e4998bbf752f0bee3 -1e0070b92429c151b33bdd1bb4430a0e650a3dfc94d404054e93c8568330ecc505 -e3b64149f1b76231686d592d1d4af984ce2826ba03c2224a92f95f9526130ce4eb40 -5f8e378120b73db9eefa65ddcdcdcb4acd8046c31a5e47f298caa400937d5623f1394b -74c757a4165a1782c933e587353a9fd8f6d7bf26b7f51b52c542747030bfb3d560c2e5c2 -2d5ee85cc238b923806dd98db18919d1924f2340ec88917d4ce1799cbfd5f2cb9df99db2e1 -c93ff727e6f9822efec0a77eed0025c0eff19127bf8746b7c71c2a098f57cef02febb86a1e6c -adfb6d7ba13779a5dd1bbf268e400f4156f0f5c9d5b670ff539e1d9c1a63373416f3001f338407 -3a6900e58a448887d77c5911e4bdde620e64f25b2d71723fa60f7cb3efa7c320b6153bdbc3287949 -413eb0fd379b32dd88e82242a87cc58ce3e64c72352387a4c70f92ee5c8d23fa7ecd86f6df170a32d2 -92d0d3cacc3e25628caf6f2c4cd50d25d154ac45098f531d690230b859f37cfe089eb169f76bba72a3ff -92f6ccc11a9a3bee520b17e0cddc4550c0e9cf47ddd9a6161284259ffb161c1d0675b505cb1066872768e8 -a3cd675804e6be7f120138a9eaadcd56bb7763d1c046e87fe0d358c8276b0d24621f46c60b46e397933b75b4 -304a1af53cbdd6486b8419d1ebd5e9528c540d8dc46a10be49067f46a0617229577015d776783f702b2954df43 -d8a6358970446453ac0c82c758644ab68989b5b4f06f9768807ce0c5f2a0dbac1e8450f4e3a02deecf7b54b6a45d -1264b8dee9ac4aa8de69a43ada95cc95f20230f33836d4a1db8c2466ab38361686e5ac282025ccc2e0f6a1cd98a4dd -7eed787abaa7f4e8b8aa3090f0676201cfbaaf350899661cdd5216ac0b5cd874443f5c0688ffd7ca1ccbfe1ca7e1a3f5 -8907f0218585167962a8e8213559a643dd03c2bf1a7a5ad3e3bc5f88c0ff1532ee8cd29880e7e0e68da22a5798aef27cc5 -12dea17b0733e5060751b1115e10c3d4b2f4583bcd009d9f1f42ec23d4a6a0df1185d3abbdbe86de08569e70583d6de1c1fe -8ff75e91f1de547dc3a25472db2f51f5910a290c449603da54207b5e39bd735d240ec913b52df90709b5d29357971d6c341452 -4a3b16b12400f38e74778efc3a4caa52ec6fdf6b0180a5bfac9189e52e162c10e8911a54ab33e2b389ee1949e58edaa119e2b2b9 -c9943e7186fdc9bbfa1d7087fa7086babe6fcf95a6196d1772187854071304e2f1fff39e6e6f48f76addb16d5c00249e0523aac91f -0297f16fdd34add9cc87b4adf816525b590ba08ac733c43f8d225d194df4f9c83b4dce617be51e25b5f6c80dff249f27c707de20e422 -576bb891eab9930998e2e73b5d0498e3c5f040f8dec9397a8c7a622c17de01fee7cc936e3bd4de1f7fd8b31dea9e70c65462bbb5dc7b50 -9416a57ae7c8c51c6e008f940fe06d8ebc02c350c19a2f71583a6d260b085670d73a95248fef0f4cae5292ba7db1189a7cd9c51122ba7913 -ea644b9051cca5eee8868a553e3f0f4e14739e1555474151156e10578256b288a233870dd43a380765400ea446df7f452c1e03a9e5b6731256 -f99cc1603de221abc1ecb1a7eb4bbf06e99561d1cc5541d8d601bae2b1dd3cbe448ac276667f26de5e269183a09f7deaf35d33174b3cc8ad4aa2 -ee2be1ec57fdac23f89402a534177eca0f4b982a4ed2c2e900b6a79e1f47a2d023eff2e647baf4f4c0da3a28d08a44bc780516974074e2523e6651 -9cda001868949a2bad96c5b3950a8315e6e5214d0b54dcd596280565d351806ef22cf3053f63623da72fcad9afa3896641658632334c9ec4f644c984 -c6d6722a916651a8671383d8260873347d9c248696b4cb3dac4dea9ba57ed971127cb18e44211d7e14177ace248b3c6e0785356ee261ebdc6ef0faf143 -5dd258a3e7505bc6b9776b0df25676a1c19e2c8258c7b5f2e361423523d96299eb6827bc7c27e7bca2d2b59d717c2ebcb05e6dcaa32289d96fae9a4077ef -19c14de35fe19c92cc0e624280e4136355d4cfa9a0a98b090c4b06f5665021920725852ff1f566b0c8c37157b25fb9f947a2e70b40577a17860a0732c170ac -5fcdcc02be7714a0dbc77df498bf999ea9225d564adca1c121c9af03af92cac8177b9b4a86bcc47c79aa32aac58a3fef967b2132e9352d4613fe890beed2571b diff --git a/test/default/hash.exp b/test/default/hash.exp deleted file mode 100644 index df582172..00000000 --- a/test/default/hash.exp +++ /dev/null @@ -1 +0,0 @@ -24f950aac7b9ea9b3cb728228a0c82b67c39e96b4b344798870d5daee93e3ae5931baae8c7cacfea4b629452c38026a81d138bc7aad1af3ef7bfd5ec646d6c28 diff --git a/test/default/hash2.exp b/test/default/hash2.exp deleted file mode 100644 index df582172..00000000 --- a/test/default/hash2.exp +++ /dev/null @@ -1 +0,0 @@ -24f950aac7b9ea9b3cb728228a0c82b67c39e96b4b344798870d5daee93e3ae5931baae8c7cacfea4b629452c38026a81d138bc7aad1af3ef7bfd5ec646d6c28 diff --git a/test/default/hash3.exp b/test/default/hash3.exp deleted file mode 100644 index df582172..00000000 --- a/test/default/hash3.exp +++ /dev/null @@ -1 +0,0 @@ -24f950aac7b9ea9b3cb728228a0c82b67c39e96b4b344798870d5daee93e3ae5931baae8c7cacfea4b629452c38026a81d138bc7aad1af3ef7bfd5ec646d6c28 diff --git a/test/default/onetimeauth.exp b/test/default/onetimeauth.exp deleted file mode 100644 index 6d914615..00000000 --- a/test/default/onetimeauth.exp +++ /dev/null @@ -1,2 +0,0 @@ -,0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5 -,0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9 diff --git a/test/default/onetimeauth2.exp b/test/default/onetimeauth2.exp deleted file mode 100644 index 573541ac..00000000 --- a/test/default/onetimeauth2.exp +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/test/default/onetimeauth7.exp b/test/default/onetimeauth7.exp deleted file mode 100644 index e69de29b..00000000 diff --git a/test/default/scalarmult.exp b/test/default/scalarmult.exp deleted file mode 100644 index ddd130d6..00000000 --- a/test/default/scalarmult.exp +++ /dev/null @@ -1,4 +0,0 @@ - 0x85,0x20,0xf0,0x09,0x89,0x30,0xa7,0x54 -,0x74,0x8b,0x7d,0xdc,0xb4,0x3e,0xf7,0x5a -,0x0d,0xbf,0x3a,0x0d,0x26,0x38,0x1a,0xf4 -,0xeb,0xa4,0xa9,0x8e,0xaa,0x9b,0x4e,0x6a diff --git a/test/default/scalarmult2.exp b/test/default/scalarmult2.exp deleted file mode 100644 index b5391865..00000000 --- a/test/default/scalarmult2.exp +++ /dev/null @@ -1,4 +0,0 @@ - 0xde,0x9e,0xdb,0x7d,0x7b,0x7d,0xc1,0xb4 -,0xd3,0x5b,0x61,0xc2,0xec,0xe4,0x35,0x37 -,0x3f,0x83,0x43,0xc8,0x5b,0x78,0x67,0x4d -,0xad,0xfc,0x7e,0x14,0x6f,0x88,0x2b,0x4f diff --git a/test/default/scalarmult5.exp b/test/default/scalarmult5.exp deleted file mode 100644 index bec21130..00000000 --- a/test/default/scalarmult5.exp +++ /dev/null @@ -1,4 +0,0 @@ - 0x4a,0x5d,0x9d,0x5b,0xa4,0xce,0x2d,0xe1 -,0x72,0x8e,0x3b,0xf4,0x80,0x35,0x0f,0x25 -,0xe0,0x7e,0x21,0xc9,0x47,0xd1,0x9e,0x33 -,0x76,0xf0,0x9b,0x3c,0x1e,0x16,0x17,0x42 diff --git a/test/default/scalarmult6.exp b/test/default/scalarmult6.exp deleted file mode 100644 index bec21130..00000000 --- a/test/default/scalarmult6.exp +++ /dev/null @@ -1,4 +0,0 @@ - 0x4a,0x5d,0x9d,0x5b,0xa4,0xce,0x2d,0xe1 -,0x72,0x8e,0x3b,0xf4,0x80,0x35,0x0f,0x25 -,0xe0,0x7e,0x21,0xc9,0x47,0xd1,0x9e,0x33 -,0x76,0xf0,0x9b,0x3c,0x1e,0x16,0x17,0x42 diff --git a/test/default/scalarmult7.c b/test/default/scalarmult7.c index 77ce820b..7b6227bc 100644 --- a/test/default/scalarmult7.c +++ b/test/default/scalarmult7.c @@ -23,8 +23,6 @@ unsigned char out2[32]; int main(void) { - int i; - scalar[0] = 1U; crypto_scalarmult_curve25519(out1, scalar, p1); crypto_scalarmult_curve25519(out2, scalar, p2); diff --git a/test/default/scalarmult7.exp b/test/default/scalarmult7.exp deleted file mode 100644 index 573541ac..00000000 --- a/test/default/scalarmult7.exp +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/test/default/scalarmult8.c b/test/default/scalarmult8.c index 0092bcd0..3ccbd292 100644 --- a/test/default/scalarmult8.c +++ b/test/default/scalarmult8.c @@ -23,8 +23,6 @@ unsigned char out2[32]; int main(void) { - int i; - scalar[0] = 1U; crypto_scalarmult_curve25519(out1, scalar, p1); crypto_scalarmult_curve25519(out2, scalar, p2); diff --git a/test/default/scalarmult8.exp b/test/default/scalarmult8.exp deleted file mode 100644 index 573541ac..00000000 --- a/test/default/scalarmult8.exp +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/test/default/secretbox.exp b/test/default/secretbox.exp deleted file mode 100644 index 2b6c51ea..00000000 --- a/test/default/secretbox.exp +++ /dev/null @@ -1,19 +0,0 @@ -,0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5 -,0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9 -,0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73 -,0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce -,0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4 -,0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a -,0xc0,0xdf,0xc1,0x7c,0x98,0xdc,0xe8,0x7b -,0x4d,0xa7,0xf0,0x11,0xec,0x48,0xc9,0x72 -,0x71,0xd2,0xc2,0x0f,0x9b,0x92,0x8f,0xe2 -,0x27,0x0d,0x6f,0xb8,0x63,0xd5,0x17,0x38 -,0xb4,0x8e,0xee,0xe3,0x14,0xa7,0xcc,0x8a -,0xb9,0x32,0x16,0x45,0x48,0xe5,0x26,0xae -,0x90,0x22,0x43,0x68,0x51,0x7a,0xcf,0xea -,0xbd,0x6b,0xb3,0x73,0x2b,0xc0,0xe9,0xda -,0x99,0x83,0x2b,0x61,0xca,0x01,0xb6,0xde -,0x56,0x24,0x4a,0x9e,0x88,0xd5,0xf9,0xb3 -,0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6 -,0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74 -,0xe3,0x55,0xa5 diff --git a/test/default/secretbox2.exp b/test/default/secretbox2.exp deleted file mode 100644 index c61d4557..00000000 --- a/test/default/secretbox2.exp +++ /dev/null @@ -1,17 +0,0 @@ -,0xbe,0x07,0x5f,0xc5,0x3c,0x81,0xf2,0xd5 -,0xcf,0x14,0x13,0x16,0xeb,0xeb,0x0c,0x7b -,0x52,0x28,0xc5,0x2a,0x4c,0x62,0xcb,0xd4 -,0x4b,0x66,0x84,0x9b,0x64,0x24,0x4f,0xfc -,0xe5,0xec,0xba,0xaf,0x33,0xbd,0x75,0x1a -,0x1a,0xc7,0x28,0xd4,0x5e,0x6c,0x61,0x29 -,0x6c,0xdc,0x3c,0x01,0x23,0x35,0x61,0xf4 -,0x1d,0xb6,0x6c,0xce,0x31,0x4a,0xdb,0x31 -,0x0e,0x3b,0xe8,0x25,0x0c,0x46,0xf0,0x6d -,0xce,0xea,0x3a,0x7f,0xa1,0x34,0x80,0x57 -,0xe2,0xf6,0x55,0x6a,0xd6,0xb1,0x31,0x8a -,0x02,0x4a,0x83,0x8f,0x21,0xaf,0x1f,0xde -,0x04,0x89,0x77,0xeb,0x48,0xf5,0x9f,0xfd -,0x49,0x24,0xca,0x1c,0x60,0x90,0x2e,0x52 -,0xf0,0xa0,0x89,0xbc,0x76,0x89,0x70,0x40 -,0xe0,0x82,0xf9,0x37,0x76,0x38,0x48,0x64 -,0x5e,0x07,0x05 diff --git a/test/default/secretbox7.exp b/test/default/secretbox7.exp deleted file mode 100644 index e69de29b..00000000 diff --git a/test/default/secretbox8.exp b/test/default/secretbox8.exp deleted file mode 100644 index e69de29b..00000000 diff --git a/test/default/secretbox_easy.exp b/test/default/secretbox_easy.exp deleted file mode 100644 index 2b6c51ea..00000000 --- a/test/default/secretbox_easy.exp +++ /dev/null @@ -1,19 +0,0 @@ -,0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5 -,0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9 -,0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73 -,0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce -,0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4 -,0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a -,0xc0,0xdf,0xc1,0x7c,0x98,0xdc,0xe8,0x7b -,0x4d,0xa7,0xf0,0x11,0xec,0x48,0xc9,0x72 -,0x71,0xd2,0xc2,0x0f,0x9b,0x92,0x8f,0xe2 -,0x27,0x0d,0x6f,0xb8,0x63,0xd5,0x17,0x38 -,0xb4,0x8e,0xee,0xe3,0x14,0xa7,0xcc,0x8a -,0xb9,0x32,0x16,0x45,0x48,0xe5,0x26,0xae -,0x90,0x22,0x43,0x68,0x51,0x7a,0xcf,0xea -,0xbd,0x6b,0xb3,0x73,0x2b,0xc0,0xe9,0xda -,0x99,0x83,0x2b,0x61,0xca,0x01,0xb6,0xde -,0x56,0x24,0x4a,0x9e,0x88,0xd5,0xf9,0xb3 -,0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6 -,0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74 -,0xe3,0x55,0xa5 diff --git a/test/default/secretbox_easy2.exp b/test/default/secretbox_easy2.exp deleted file mode 100644 index 573541ac..00000000 --- a/test/default/secretbox_easy2.exp +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/test/default/shorthash.exp b/test/default/shorthash.exp deleted file mode 100644 index 6ec8684d..00000000 --- a/test/default/shorthash.exp +++ /dev/null @@ -1,64 +0,0 @@ -310e0edd47db6f72 -fd67dc93c539f874 -5a4fa9d909806c0d -2d7efbd796666785 -b7877127e09427cf -8da699cd64557618 -cee3fe586e46c9cb -37d1018bf50002ab -6224939a79f5f593 -b0e4a90bdf82009e -f3b9dd94c5bb5d7a -a7ad6b22462fb3f4 -fbe50e86bc8f1e75 -903d84c02756ea14 -eef27a8e90ca23f7 -e545be4961ca29a1 -db9bc2577fcc2a3f -9447be2cf5e99a69 -9cd38d96f0b3c14b -bd6179a71dc96dbb -98eea21af25cd6be -c7673b2eb0cbf2d0 -883ea3e395675393 -c8ce5ccd8c030ca8 -94af49f6c650adb8 -eab8858ade92e1bc -f315bb5bb835d817 -adcf6b0763612e2f -a5c91da7acaa4dde -716595876650a2a6 -28ef495c53a387ad -42c341d8fa92d832 -ce7cf2722f512771 -e37859f94623f3a7 -381205bb1ab0e012 -ae97a10fd434e015 -b4a31508beff4d31 -81396229f0907902 -4d0cf49ee5d4dcca -5c73336a76d8bf9a -d0a704536ba93e0e -925958fcd6420cad -a915c29bc8067318 -952b79f3bc0aa6d4 -f21df2e41d4535f9 -87577519048f53a9 -10a56cf5dfcd9adb -eb75095ccd986cd0 -51a9cb9ecba312e6 -96afadfc2ce666c7 -72fe52975a4364ee -5a1645b276d592a1 -b274cb8ebf87870a -6f9bb4203de7b381 -eaecb2a30b22a87f -9924a43cc1315724 -bd838d3aafbf8db7 -0b1a2a3265d51aea -135079a3231ce660 -932b2846e4d70666 -e1915f5cb1eca46c -f325965ca16d629f -575ff28e60381be5 -724506eb4c328a95 diff --git a/test/default/sodium_core.exp b/test/default/sodium_core.exp deleted file mode 100644 index d00491fd..00000000 --- a/test/default/sodium_core.exp +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/test/default/sodium_utils.exp b/test/default/sodium_utils.exp deleted file mode 100644 index 713a1d9b..00000000 --- a/test/default/sodium_utils.exp +++ /dev/null @@ -1,6 +0,0 @@ -0 -0 --1 -0 -0 -30313233343536373839414243444546 diff --git a/test/default/sodium_version.exp b/test/default/sodium_version.exp deleted file mode 100644 index e8183f05..00000000 --- a/test/default/sodium_version.exp +++ /dev/null @@ -1,3 +0,0 @@ -1 -1 -1 diff --git a/test/default/stream.exp b/test/default/stream.exp deleted file mode 100644 index 5fa208c1..00000000 --- a/test/default/stream.exp +++ /dev/null @@ -1 +0,0 @@ -662b9d0e3463029156069b12f918691a98f7dfb2ca0393c96bbfc6b1fbd630a2 diff --git a/test/default/stream2.exp b/test/default/stream2.exp deleted file mode 100644 index 5fa208c1..00000000 --- a/test/default/stream2.exp +++ /dev/null @@ -1 +0,0 @@ -662b9d0e3463029156069b12f918691a98f7dfb2ca0393c96bbfc6b1fbd630a2 diff --git a/test/default/stream3.exp b/test/default/stream3.exp deleted file mode 100644 index 9cd78798..00000000 --- a/test/default/stream3.exp +++ /dev/null @@ -1,4 +0,0 @@ -,0xee,0xa6,0xa7,0x25,0x1c,0x1e,0x72,0x91 -,0x6d,0x11,0xc2,0xcb,0x21,0x4d,0x3c,0x25 -,0x25,0x39,0x12,0x1d,0x8e,0x23,0x4e,0x65 -,0x2d,0x65,0x1f,0xa4,0xc8,0xcf,0xf8,0x80 diff --git a/test/default/stream4.exp b/test/default/stream4.exp deleted file mode 100644 index 0d3d8e94..00000000 --- a/test/default/stream4.exp +++ /dev/null @@ -1,17 +0,0 @@ -,0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73 -,0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce -,0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4 -,0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a -,0xc0,0xdf,0xc1,0x7c,0x98,0xdc,0xe8,0x7b -,0x4d,0xa7,0xf0,0x11,0xec,0x48,0xc9,0x72 -,0x71,0xd2,0xc2,0x0f,0x9b,0x92,0x8f,0xe2 -,0x27,0x0d,0x6f,0xb8,0x63,0xd5,0x17,0x38 -,0xb4,0x8e,0xee,0xe3,0x14,0xa7,0xcc,0x8a -,0xb9,0x32,0x16,0x45,0x48,0xe5,0x26,0xae -,0x90,0x22,0x43,0x68,0x51,0x7a,0xcf,0xea -,0xbd,0x6b,0xb3,0x73,0x2b,0xc0,0xe9,0xda -,0x99,0x83,0x2b,0x61,0xca,0x01,0xb6,0xde -,0x56,0x24,0x4a,0x9e,0x88,0xd5,0xf9,0xb3 -,0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6 -,0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74 -,0xe3,0x55,0xa5 diff --git a/test/default/stream5.exp b/test/default/stream5.exp deleted file mode 100644 index d55bf9f9..00000000 --- a/test/default/stream5.exp +++ /dev/null @@ -1 +0,0 @@ -b5d3f979ab4a760787484b4e0cf7c82db358b06fdf365cc7d456cc91258af618 diff --git a/test/default/stream6.exp b/test/default/stream6.exp deleted file mode 100644 index a74aee22..00000000 --- a/test/default/stream6.exp +++ /dev/null @@ -1,17 +0,0 @@ -,0x04,0x1d,0x9f,0xb0,0x61,0x23,0xe3,0x37 -,0x05,0xbb,0x0a,0xfe,0x81,0xc6,0x63,0x87 -,0xd0,0x61,0x26,0xd8,0xd7,0x18,0x97,0x66 -,0xc6,0x15,0xf3,0x46,0x58,0x7d,0xdc,0x0a -,0x68,0xdd,0xc0,0xaa,0x44,0x80,0xc5,0xa2 -,0x1c,0xea,0x1f,0xfa,0x17,0xfe,0xe0,0xd1 -,0x00,0x0f,0x8f,0x70,0x0c,0xd2,0x9e,0xe1 -,0x00,0x88,0xdf,0xfa,0xf8,0xbd,0x07,0x62 -,0xbf,0xfd,0x81,0xa8,0x84,0x30,0x39,0x01 -,0x85,0x08,0x8d,0x66,0x5d,0x96,0x20,0x14 -,0xa0,0x5a,0xa4,0xe8,0xd2,0x07,0x4f,0x47 -,0x0c,0x2b,0xbc,0x9b,0xd1,0x11,0x85,0xda -,0x71,0xc3,0x59,0x5c,0xd9,0x27,0x64,0x89 -,0xf2,0x2d,0xa7,0x10,0x80,0xdf,0xbb,0x0f -,0x32,0xb9,0x9a,0x07,0x66,0x6c,0x7c,0x41 -,0xf6,0x78,0x71,0xf7,0x8d,0x69,0xb9,0xb1 -,0x79,0x8e,0xe3