From 19ebd2567b27484244f891d269a4c8972407e059 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Mon, 7 Apr 2014 02:04:26 -0700 Subject: [PATCH 01/57] Add vs2013 project with static/ltcg/dynamic, debug/release, x86/x64, NuGet. --- .gitignore | 2 + builds/msvc/.gitignore | 5 + builds/msvc/libsodium.rc | Bin 0 -> 4616 bytes builds/msvc/resource.h | Bin 0 -> 816 bytes builds/msvc/vs2013/libsodium.sln | 52 ++ builds/msvc/vs2013/libsodium/libsodium.props | 40 ++ .../msvc/vs2013/libsodium/libsodium.vcxproj | 372 +++++++++++ .../libsodium/libsodium.vcxproj.filters | 591 ++++++++++++++++++ builds/msvc/vs2013/properties/Common.props | 27 + builds/msvc/vs2013/properties/Debug.props | 29 + builds/msvc/vs2013/properties/Dynamic.props | 19 + .../msvc/vs2013/properties/DynamicDebug.props | 22 + .../vs2013/properties/DynamicRelease.props | 21 + .../properties/LinkTimeCodeGeneration.props | 21 + builds/msvc/vs2013/properties/Release.props | 41 ++ builds/msvc/vs2013/properties/Static.props | 19 + .../msvc/vs2013/properties/StaticDebug.props | 22 + .../StaticDebugLinkTimeCodeGeneration.props | 22 + .../StaticLinkTimeCodeGeneration.props | 18 + .../vs2013/properties/StaticRelease.props | 21 + .../StaticReleaseLinkTimeCodeGeneration.props | 21 + builds/msvc/vs2013/properties/Win32.props | 21 + builds/msvc/vs2013/properties/x64.props | 24 + packaging/nuget/.gitignore | 1 + packaging/nuget/package.bat | 13 + packaging/nuget/package.config | 4 + packaging/nuget/package.gsl | 312 +++++++++ packaging/nuget/package.nuspec | 146 +++++ packaging/nuget/package.targets | 132 ++++ packaging/nuget/package.xml | 22 + 30 files changed, 2040 insertions(+) create mode 100644 builds/msvc/.gitignore create mode 100644 builds/msvc/libsodium.rc create mode 100644 builds/msvc/resource.h create mode 100644 builds/msvc/vs2013/libsodium.sln create mode 100644 builds/msvc/vs2013/libsodium/libsodium.props create mode 100644 builds/msvc/vs2013/libsodium/libsodium.vcxproj create mode 100644 builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters create mode 100644 builds/msvc/vs2013/properties/Common.props create mode 100644 builds/msvc/vs2013/properties/Debug.props create mode 100644 builds/msvc/vs2013/properties/Dynamic.props create mode 100644 builds/msvc/vs2013/properties/DynamicDebug.props create mode 100644 builds/msvc/vs2013/properties/DynamicRelease.props create mode 100644 builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2013/properties/Release.props create mode 100644 builds/msvc/vs2013/properties/Static.props create mode 100644 builds/msvc/vs2013/properties/StaticDebug.props create mode 100644 builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2013/properties/StaticRelease.props create mode 100644 builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2013/properties/Win32.props create mode 100644 builds/msvc/vs2013/properties/x64.props create mode 100644 packaging/nuget/.gitignore create mode 100644 packaging/nuget/package.bat create mode 100644 packaging/nuget/package.config create mode 100644 packaging/nuget/package.gsl create mode 100644 packaging/nuget/package.nuspec create mode 100644 packaging/nuget/package.targets create mode 100644 packaging/nuget/package.xml diff --git a/.gitignore b/.gitignore index 15e1f017..8f9c59fa 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,5 @@ test-driver testing android-toolchain-* libsodium-android-* +/bin/ +/obj/ diff --git a/builds/msvc/.gitignore b/builds/msvc/.gitignore new file mode 100644 index 00000000..1bf6266d --- /dev/null +++ b/builds/msvc/.gitignore @@ -0,0 +1,5 @@ +*.opensdf +*.suo +*.sdf +*.vcxproj.user +*.aps diff --git a/builds/msvc/libsodium.rc b/builds/msvc/libsodium.rc new file mode 100644 index 0000000000000000000000000000000000000000..1e47e0c7a9e2e4493debf0abede4d8fae3642b56 GIT binary patch literal 4616 zcmdUzTTfa+5Xa}aNx#D>zG!L`tETCr%B7}=MlNX+6XFd@O2KjIUTkB#v>vM?drgb1W4G3)57{3v z-mo`h6yBKGHS>s-sCDfQm@Rv0FSupfjce@oIqd;`<6v_$_*?ebat>OUYYwjM@I?E- z&a7s2YgoaK?bKR!Zbfzr%&S(hPwdqAJ+VV}D$K+E;$ih#;4X}jmC?(zj@xKyU|*4c zgm$EdI#Pe+_ZX>07vj2uYZIP#K@ZIUxs2bYZlHKzCA`YVRE_v) z5M4*y+`_vmG|~Md86x4^1`zu|7Juv=xf!B}>F8g@Kf8QRCh>U-OSb`7{g zc0A5BM2k}&)!qXn%X|+|d^C~d1Gg6byIhbR<-sR3s_&q)Y{}$cjGwdFe3P>a^40|&?Q{Qx%Xu8_F3HiN_pG^md_$xu$M~ik zk(F;|y)D>iwX#Z*8*!+081?q+g^!VVfIY%~kfcfUwSXxS=QZ~RS6NH)5^*N%@AWG7FPAGW_I}iA`Wa1b-Jr18w!0VmTt!a!?`17>);8AVw9%rJh zI`zyM9D2C7Gv_{ErlG>k*|D$edWv49nH(I9u(v9+4i@Sn*)4YJ!|Pxw8ndZ|s7OA>pW#1Y!Q{b*-h3lha{_V@$k&eJXJ5M#eN8hK<(`PpCvZm^U zA)_k#r**an*A*yt99>!F4x7lEI#em62dk`8^{aX)aVEQcVJ=Oof{B^0vpb>*(_6^v z)mO9MuvwQgeQ|6oWVO?KUgX`9JXley$Gv8YyLz-mG;zjl^1Ct8j-FY|Y1+$s$mCrQ zzB0R$j^rk~8a`-lnaq%m-#XOf12Ni_)sqpVJni#_qIrk9LpjmsOwaFx+sRDl^WW*` zshpE<=4#C)eX{%4?XmBo**aylBua84$+QmRzkVUBZhZU;Ip{LU#cIvP;e3DZlY{gh M&g}Q_tldTFFIB-P0ssI2 literal 0 HcmV?d00001 diff --git a/builds/msvc/resource.h b/builds/msvc/resource.h new file mode 100644 index 0000000000000000000000000000000000000000..d89f84ce05813202a6fff2fc0d51fc6822220872 GIT binary patch literal 816 zcmb7?-Acni5QWdR;5#gMDHsdBKumfOY*J}V(W}s=iBxI}N#hUVtE=B`TBu$G%dpwm z$(eIzPxAfc$IMoSQPe!qpDpYHuhE-`xZAz_CtC?1u z0-X~^k1Dlh)zr7_3u;R$1*n!&$+@DkBD*+H$l&VGbG?IEftfqC1zD?S&^0Xkne4vL z4bzu;b5mJ`3hfpKJLQX;ucg{JbLF0*c1=!|*&oZB(Te*oVkUlP@x>JTv zk#jCWbxL-FU!m*mI@Ucs6RJO3j=OWxev5uy S>(8Ml_J6hiShe%$_xT4x=5;*) literal 0 HcmV?d00001 diff --git a/builds/msvc/vs2013/libsodium.sln b/builds/msvc/vs2013/libsodium.sln new file mode 100644 index 00000000..cbc694f1 --- /dev/null +++ b/builds/msvc/vs2013/libsodium.sln @@ -0,0 +1,52 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +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 +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/vs2013/libsodium/libsodium.props b/builds/msvc/vs2013/libsodium/libsodium.props new file mode 100644 index 00000000..b037ece7 --- /dev/null +++ b/builds/msvc/vs2013/libsodium/libsodium.props @@ -0,0 +1,40 @@ + + + + + <_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_EXPORT=;SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj new file mode 100644 index 00000000..cfb372ac --- /dev/null +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -0,0 +1,372 @@ + + + + {A185B162-6CB6-4502-B03F-B56F7699A8D9} + libsodium + libsodium12 + + + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + DebugDLL + x64 + + + ReleaseDLL + x64 + + + DebugLTCG + Win32 + + + ReleaseLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + x64 + + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + + + + v120 + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters new file mode 100644 index 00000000..805f7e01 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/Common.props b/builds/msvc/vs2013/properties/Common.props new file mode 100644 index 00000000..79b0b6c5 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/Debug.props b/builds/msvc/vs2013/properties/Debug.props new file mode 100644 index 00000000..7f060f47 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/Dynamic.props b/builds/msvc/vs2013/properties/Dynamic.props new file mode 100644 index 00000000..8f57f137 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/DynamicDebug.props b/builds/msvc/vs2013/properties/DynamicDebug.props new file mode 100644 index 00000000..03954333 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/DynamicRelease.props b/builds/msvc/vs2013/properties/DynamicRelease.props new file mode 100644 index 00000000..1b1de610 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props new file mode 100644 index 00000000..338a9704 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/Release.props b/builds/msvc/vs2013/properties/Release.props new file mode 100644 index 00000000..aff972fd --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/Static.props b/builds/msvc/vs2013/properties/Static.props new file mode 100644 index 00000000..9b30a132 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/StaticDebug.props b/builds/msvc/vs2013/properties/StaticDebug.props new file mode 100644 index 00000000..b5e5ba9a --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..ae5f3504 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props new file mode 100644 index 00000000..8009311c --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/StaticRelease.props b/builds/msvc/vs2013/properties/StaticRelease.props new file mode 100644 index 00000000..d7a60580 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..668a9e9d --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/Win32.props b/builds/msvc/vs2013/properties/Win32.props new file mode 100644 index 00000000..bc64e844 --- /dev/null +++ b/builds/msvc/vs2013/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/vs2013/properties/x64.props b/builds/msvc/vs2013/properties/x64.props new file mode 100644 index 00000000..1c750d62 --- /dev/null +++ b/builds/msvc/vs2013/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/packaging/nuget/.gitignore b/packaging/nuget/.gitignore new file mode 100644 index 00000000..a7aeaaa1 --- /dev/null +++ b/packaging/nuget/.gitignore @@ -0,0 +1 @@ +*.nupkg diff --git a/packaging/nuget/package.bat b/packaging/nuget/package.bat new file mode 100644 index 00000000..f0d3470f --- /dev/null +++ b/packaging/nuget/package.bat @@ -0,0 +1,13 @@ +@ECHO OFF +ECHO Started nuget packaging build. +ECHO. +REM: http://www.nuget.org/packages/gslgen +gslgen -q -script:package.gsl package.config +ECHO. +REM: http://nuget.codeplex.com/releases +nuget pack package.nuspec -verbosity detailed +ECHO. +ECHO NOTE: Ignore warnings not applicable to native code: "Issue: Assembly outside lib folder." +ECHO. +ECHO Completed nuget packaging build. The package is in the following folder: +CD \ No newline at end of file diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config new file mode 100644 index 00000000..944772c5 --- /dev/null +++ b/packaging/nuget/package.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl new file mode 100644 index 00000000..b0e31c2e --- /dev/null +++ b/packaging/nuget/package.gsl @@ -0,0 +1,312 @@ +.# Generate NuGet nuspec file (for subsequent packing). +.# +.# This is a code generator built using the iMatix GSL code generation +.# language. See https://github.com/imatix/gsl for details. This script +.# is licensed under MIT/X11. +.# +.echo "Generating package.nuspec from template." +.output "package.nuspec" + + + + + $(package.id) + $(package.version) + $(package.id) + libsodium contributors + Eric Voskuil + https://raw.github.com/jedisct1/libsodium/master/LICENSE + https://github.com/jedisct1/libsodium + http://upload.wikimedia.org/wikipedia/commons/thumb/7/78/Salt_shaker_on_white_background.jpg/220px-Salt_shaker_on_white_background.jpg + true + true + Sodium is a portable, cross-compilable, installable, packageable fork of NaCl (based on the latest released upstream version nacl-20110221), with a compatible API. + Portable fork of NaCl, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers. + https://raw.github.com/jedisct1/libsodium/master/ChangeLog + (c) 2013-2014, Frank Denis (attribution required) + native, NaCl, salt, sodium, libodium, C++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +.echo "Generating package.targets from template." +.output "package.targets" + + + + + + + + + + + + + $\(MSBuildThisFileDirectory)include\\;%(AdditionalIncludeDirectories) + + + $\(MSBuildThisFileDirectory)bin\\;%(AdditionalLibraryDirectories) + + + + + SODIUM_EXPORT=__declspec(dllimport);DLL_EXPORT;%(PreprocessorDefinitions) + + + + + SODIUM_EXPORT=;SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + +.echo "Generating package.xml (ui extension) from template." +.output "package.xml" + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec new file mode 100644 index 00000000..5a9a39de --- /dev/null +++ b/packaging/nuget/package.nuspec @@ -0,0 +1,146 @@ + + + + + libsodium_vc120 + 0.4.5.0 + libsodium_vc120 + libsodium contributors + Eric Voskuil + https://raw.github.com/jedisct1/libsodium/master/LICENSE + https://github.com/jedisct1/libsodium + http://upload.wikimedia.org/wikipedia/commons/thumb/7/78/Salt_shaker_on_white_background.jpg/220px-Salt_shaker_on_white_background.jpg + true + true + Sodium is a portable, cross-compilable, installable, packageable fork of NaCl (based on the latest released upstream version nacl-20110221), with a compatible API. + Portable fork of NaCl, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers. + https://raw.github.com/jedisct1/libsodium/master/ChangeLog + (c) 2013-2014, Frank Denis (attribution required) + native, NaCl, salt, sodium, libodium, C++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/nuget/package.targets b/packaging/nuget/package.targets new file mode 100644 index 00000000..c27ef37a --- /dev/null +++ b/packaging/nuget/package.targets @@ -0,0 +1,132 @@ + + + + + + + + + + + + + $(MSBuildThisFileDirectory)include\;%(AdditionalIncludeDirectories) + + + $(MSBuildThisFileDirectory)bin\;%(AdditionalLibraryDirectories) + + + + + SODIUM_EXPORT=__declspec(dllimport);DLL_EXPORT;%(PreprocessorDefinitions) + + + + + SODIUM_EXPORT=;SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + + libsodium-x86-v120-mt-s-0_4_5_0.lib;%(AdditionalDependencies) + + + + + libsodium-x86-v120-mt-sgd-0_4_5_0.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-s-0_4_5_0.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-sgd-0_4_5_0.lib;%(AdditionalDependencies) + + + + + + + libsodium-x86-v120-mt-s-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + + + + + libsodium-x86-v120-mt-sgd-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-s-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-sgd-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + + + + + + + libsodium-x86-v120-mt-0_4_5_0.imp.lib;%(AdditionalDependencies) + + + + + libsodium-x86-v120-mt-gd-0_4_5_0.imp.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-0_4_5_0.imp.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-gd-0_4_5_0.imp.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/nuget/package.xml b/packaging/nuget/package.xml new file mode 100644 index 00000000..abaea230 --- /dev/null +++ b/packaging/nuget/package.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file From 74983973947984537a0544787f1387a128c32544 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Mon, 7 Apr 2014 02:27:10 -0700 Subject: [PATCH 02/57] Remove unnecessary defines in msvc project properties. --- builds/msvc/vs2013/libsodium/libsodium.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builds/msvc/vs2013/libsodium/libsodium.props b/builds/msvc/vs2013/libsodium/libsodium.props index b037ece7..68ba9e35 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.props +++ b/builds/msvc/vs2013/libsodium/libsodium.props @@ -27,13 +27,13 @@ - SODIUM_EXPORT=;SODIUM_STATIC;%(PreprocessorDefinitions) + SODIUM_STATIC;%(PreprocessorDefinitions) - SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;%(PreprocessorDefinitions) + DLL_EXPORT;%(PreprocessorDefinitions) From 8ba5f75ec4d3fcb9d73f468ddffe1c634afee7f3 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Mon, 7 Apr 2014 03:02:41 -0700 Subject: [PATCH 03/57] Remove unnecessary defines in package targets. --- packaging/nuget/package.gsl | 7 +------ packaging/nuget/package.targets | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl index b0e31c2e..9ec8d4c6 100644 --- a/packaging/nuget/package.gsl +++ b/packaging/nuget/package.gsl @@ -176,14 +176,9 @@ $\(MSBuildThisFileDirectory)bin\\;%(AdditionalLibraryDirectories) - - - SODIUM_EXPORT=__declspec(dllimport);DLL_EXPORT;%(PreprocessorDefinitions) - - - SODIUM_EXPORT=;SODIUM_STATIC;%(PreprocessorDefinitions) + SODIUM_STATIC;%(PreprocessorDefinitions) diff --git a/packaging/nuget/package.targets b/packaging/nuget/package.targets index c27ef37a..4afc268d 100644 --- a/packaging/nuget/package.targets +++ b/packaging/nuget/package.targets @@ -20,14 +20,9 @@ $(MSBuildThisFileDirectory)bin\;%(AdditionalLibraryDirectories) - - - SODIUM_EXPORT=__declspec(dllimport);DLL_EXPORT;%(PreprocessorDefinitions) - - - SODIUM_EXPORT=;SODIUM_STATIC;%(PreprocessorDefinitions) + SODIUM_STATIC;%(PreprocessorDefinitions) From 716fc4dddd592ab16cbde68451ac488ed4c06299 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Mon, 7 Apr 2014 10:48:57 -0700 Subject: [PATCH 04/57] Make implicit numeric lossy casts explicit (with comments). --- .../crypto_generichash/blake2/ref/generichash_blake2b.c | 6 ++++-- src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libsodium/crypto_generichash/blake2/ref/generichash_blake2b.c b/src/libsodium/crypto_generichash/blake2/ref/generichash_blake2b.c index da4a170c..70e07a59 100644 --- a/src/libsodium/crypto_generichash/blake2/ref/generichash_blake2b.c +++ b/src/libsodium/crypto_generichash/blake2/ref/generichash_blake2b.c @@ -56,7 +56,8 @@ crypto_generichash_blake2b_init(crypto_generichash_blake2b_state *state, if (blake2b_init(state, (uint8_t) outlen) != 0) { return -1; } - } else if (blake2b_init_key(state, (uint8_t) outlen, key, keylen) != 0) { + } else if (blake2b_init_key(state, (uint8_t) outlen, key, + (uint8_t) keylen /* Is cast from size_t to uint8_t safe here? */ ) != 0) { return -1; } return 0; @@ -81,7 +82,8 @@ crypto_generichash_blake2b_init_salt_personal(crypto_generichash_blake2b_state * return -1; } } else if (blake2b_init_key_salt_personal(state, - (uint8_t) outlen, key, keylen, + (uint8_t)outlen, key, + (uint8_t)keylen, /* Is cast from size_t to uint8_t safe here? */ salt, personal) != 0) { return -1; } diff --git a/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c b/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c index 304f4878..ff86c0b0 100644 --- a/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c +++ b/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c @@ -169,7 +169,8 @@ randombytes_sysrandom_buf(void * const buf, const size_t size) abort(); } #else - if (! CryptGenRandom(stream.hcrypt_prov, size, (BYTE *) buf)) { + // Is cast from size_t to DWORD safe here? + if (! CryptGenRandom(stream.hcrypt_prov, (DWORD) size, (BYTE *) buf)) { abort(); } #endif From 7f046509effd87798821aa6be6052a644b2b0f79 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Mon, 7 Apr 2014 19:06:10 -0700 Subject: [PATCH 05/57] Add VS2012/VS2010 solutions, add test proj to VS2013, remove export files. --- .gitignore | 1 + builds/msvc/.gitignore | 1 + builds/msvc/vs2010/libsodium.sln | 50 ++ builds/msvc/vs2010/libsodium/libsodium.props | 32 + .../msvc/vs2010/libsodium/libsodium.vcxproj | 372 +++++++++++ .../libsodium/libsodium.vcxproj.filters | 591 ++++++++++++++++++ builds/msvc/vs2010/properties/Common.props | 27 + builds/msvc/vs2010/properties/Console.props | 21 + .../properties/ConsoleDebugDynamic.props | 22 + .../ConsoleDebugLinkTimeCodeGeneration.props | 22 + .../properties/ConsoleDebugStatic.props | 21 + .../properties/ConsoleReleaseDynamic.props | 21 + ...ConsoleReleaseLinkTimeCodeGeneration.props | 21 + .../properties/ConsoleReleaseStatic.props | 20 + builds/msvc/vs2010/properties/Debug.props | 29 + builds/msvc/vs2010/properties/Dynamic.props | 19 + .../msvc/vs2010/properties/DynamicDebug.props | 22 + .../vs2010/properties/DynamicRelease.props | 21 + .../properties/LinkTimeCodeGeneration.props | 21 + builds/msvc/vs2010/properties/Release.props | 41 ++ builds/msvc/vs2010/properties/Static.props | 19 + .../msvc/vs2010/properties/StaticDebug.props | 22 + .../StaticDebugLinkTimeCodeGeneration.props | 22 + .../StaticLinkTimeCodeGeneration.props | 18 + .../vs2010/properties/StaticRelease.props | 21 + .../StaticReleaseLinkTimeCodeGeneration.props | 21 + builds/msvc/vs2010/properties/Win32.props | 21 + builds/msvc/vs2010/properties/x64.props | 24 + builds/msvc/vs2012/libsodium.sln | 50 ++ builds/msvc/vs2012/libsodium/libsodium.props | 32 + .../msvc/vs2012/libsodium/libsodium.vcxproj | 372 +++++++++++ .../libsodium/libsodium.vcxproj.filters | 591 ++++++++++++++++++ builds/msvc/vs2012/properties/Common.props | 27 + builds/msvc/vs2012/properties/Console.props | 21 + .../properties/ConsoleDebugDynamic.props | 22 + .../ConsoleDebugLinkTimeCodeGeneration.props | 22 + .../properties/ConsoleDebugStatic.props | 21 + .../properties/ConsoleReleaseDynamic.props | 21 + ...ConsoleReleaseLinkTimeCodeGeneration.props | 21 + .../properties/ConsoleReleaseStatic.props | 20 + builds/msvc/vs2012/properties/Debug.props | 29 + builds/msvc/vs2012/properties/Dynamic.props | 19 + .../msvc/vs2012/properties/DynamicDebug.props | 22 + .../vs2012/properties/DynamicRelease.props | 21 + .../properties/LinkTimeCodeGeneration.props | 21 + builds/msvc/vs2012/properties/Release.props | 41 ++ builds/msvc/vs2012/properties/Static.props | 19 + .../msvc/vs2012/properties/StaticDebug.props | 22 + .../StaticDebugLinkTimeCodeGeneration.props | 22 + .../StaticLinkTimeCodeGeneration.props | 18 + .../vs2012/properties/StaticRelease.props | 21 + .../StaticReleaseLinkTimeCodeGeneration.props | 21 + builds/msvc/vs2012/properties/Win32.props | 21 + builds/msvc/vs2012/properties/x64.props | 24 + builds/msvc/vs2013/libsodium.import.props | 80 +++ builds/msvc/vs2013/libsodium.import.xml | 16 + builds/msvc/vs2013/libsodium.sln | 29 + builds/msvc/vs2013/libsodium/libsodium.props | 8 - .../msvc/vs2013/libsodium/libsodium.vcxproj | 8 + .../libsodium/libsodium.vcxproj.filters | 6 + builds/msvc/vs2013/properties/Console.props | 21 + .../properties/ConsoleDebugDynamic.props | 22 + .../ConsoleDebugLinkTimeCodeGeneration.props | 22 + .../properties/ConsoleDebugStatic.props | 21 + .../properties/ConsoleReleaseDynamic.props | 21 + ...ConsoleReleaseLinkTimeCodeGeneration.props | 21 + .../properties/ConsoleReleaseStatic.props | 20 + builds/msvc/vs2013/test/test.props | 51 ++ builds/msvc/vs2013/test/test.runner.bat | 78 +++ builds/msvc/vs2013/test/test.vcxproj | 288 +++++++++ builds/msvc/vs2013/test/test.vcxproj.filters | 162 +++++ test/default/auth.exp | 4 - test/default/auth2.exp | 4 - test/default/auth3.exp | 1 - test/default/auth5.exp | 0 test/default/box.exp | 19 - test/default/box2.exp | 17 - test/default/box7.exp | 0 test/default/box8.exp | 0 test/default/box_easy.exp | 19 - test/default/box_easy2.exp | 1 - test/default/cmptest.h | 4 + test/default/core1.exp | 4 - test/default/core2.exp | 4 - test/default/core3.exp | 1 - test/default/core4.exp | 8 - test/default/core5.exp | 4 - test/default/core6.exp | 4 - test/default/generichash.exp | 64 -- test/default/generichash2.exp | 64 -- test/default/generichash3.exp | 64 -- test/default/hash.exp | 1 - test/default/hash2.exp | 1 - test/default/hash3.exp | 1 - test/default/onetimeauth.exp | 2 - test/default/onetimeauth2.exp | 1 - test/default/onetimeauth7.exp | 0 test/default/scalarmult.exp | 4 - test/default/scalarmult2.exp | 4 - test/default/scalarmult5.exp | 4 - test/default/scalarmult6.exp | 4 - test/default/scalarmult7.c | 2 - test/default/scalarmult7.exp | 1 - test/default/scalarmult8.c | 2 - test/default/scalarmult8.exp | 1 - test/default/secretbox.exp | 19 - test/default/secretbox2.exp | 17 - test/default/secretbox7.exp | 0 test/default/secretbox8.exp | 0 test/default/secretbox_easy.exp | 19 - test/default/secretbox_easy2.exp | 1 - test/default/shorthash.exp | 64 -- test/default/sodium_core.exp | 1 - test/default/sodium_utils.exp | 6 - test/default/sodium_version.exp | 3 - test/default/stream.exp | 1 - test/default/stream2.exp | 1 - test/default/stream3.exp | 4 - test/default/stream4.exp | 17 - test/default/stream5.exp | 1 - test/default/stream6.exp | 17 - 121 files changed, 3954 insertions(+), 489 deletions(-) create mode 100644 builds/msvc/vs2010/libsodium.sln create mode 100644 builds/msvc/vs2010/libsodium/libsodium.props create mode 100644 builds/msvc/vs2010/libsodium/libsodium.vcxproj create mode 100644 builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters create mode 100644 builds/msvc/vs2010/properties/Common.props create mode 100644 builds/msvc/vs2010/properties/Console.props create mode 100644 builds/msvc/vs2010/properties/ConsoleDebugDynamic.props create mode 100644 builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2010/properties/ConsoleDebugStatic.props create mode 100644 builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props create mode 100644 builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2010/properties/ConsoleReleaseStatic.props create mode 100644 builds/msvc/vs2010/properties/Debug.props create mode 100644 builds/msvc/vs2010/properties/Dynamic.props create mode 100644 builds/msvc/vs2010/properties/DynamicDebug.props create mode 100644 builds/msvc/vs2010/properties/DynamicRelease.props create mode 100644 builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2010/properties/Release.props create mode 100644 builds/msvc/vs2010/properties/Static.props create mode 100644 builds/msvc/vs2010/properties/StaticDebug.props create mode 100644 builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2010/properties/StaticRelease.props create mode 100644 builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2010/properties/Win32.props create mode 100644 builds/msvc/vs2010/properties/x64.props create mode 100644 builds/msvc/vs2012/libsodium.sln create mode 100644 builds/msvc/vs2012/libsodium/libsodium.props create mode 100644 builds/msvc/vs2012/libsodium/libsodium.vcxproj create mode 100644 builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters create mode 100644 builds/msvc/vs2012/properties/Common.props create mode 100644 builds/msvc/vs2012/properties/Console.props create mode 100644 builds/msvc/vs2012/properties/ConsoleDebugDynamic.props create mode 100644 builds/msvc/vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2012/properties/ConsoleDebugStatic.props create mode 100644 builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props create mode 100644 builds/msvc/vs2012/properties/ConsoleReleaseLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2012/properties/ConsoleReleaseStatic.props create mode 100644 builds/msvc/vs2012/properties/Debug.props create mode 100644 builds/msvc/vs2012/properties/Dynamic.props create mode 100644 builds/msvc/vs2012/properties/DynamicDebug.props create mode 100644 builds/msvc/vs2012/properties/DynamicRelease.props create mode 100644 builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2012/properties/Release.props create mode 100644 builds/msvc/vs2012/properties/Static.props create mode 100644 builds/msvc/vs2012/properties/StaticDebug.props create mode 100644 builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2012/properties/StaticRelease.props create mode 100644 builds/msvc/vs2012/properties/StaticReleaseLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2012/properties/Win32.props create mode 100644 builds/msvc/vs2012/properties/x64.props create mode 100644 builds/msvc/vs2013/libsodium.import.props create mode 100644 builds/msvc/vs2013/libsodium.import.xml create mode 100644 builds/msvc/vs2013/properties/Console.props create mode 100644 builds/msvc/vs2013/properties/ConsoleDebugDynamic.props create mode 100644 builds/msvc/vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2013/properties/ConsoleDebugStatic.props create mode 100644 builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props create mode 100644 builds/msvc/vs2013/properties/ConsoleReleaseLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2013/properties/ConsoleReleaseStatic.props create mode 100644 builds/msvc/vs2013/test/test.props create mode 100644 builds/msvc/vs2013/test/test.runner.bat create mode 100644 builds/msvc/vs2013/test/test.vcxproj create mode 100644 builds/msvc/vs2013/test/test.vcxproj.filters delete mode 100644 test/default/auth.exp delete mode 100644 test/default/auth2.exp delete mode 100644 test/default/auth3.exp delete mode 100644 test/default/auth5.exp delete mode 100644 test/default/box.exp delete mode 100644 test/default/box2.exp delete mode 100644 test/default/box7.exp delete mode 100644 test/default/box8.exp delete mode 100644 test/default/box_easy.exp delete mode 100644 test/default/box_easy2.exp delete mode 100644 test/default/core1.exp delete mode 100644 test/default/core2.exp delete mode 100644 test/default/core3.exp delete mode 100644 test/default/core4.exp delete mode 100644 test/default/core5.exp delete mode 100644 test/default/core6.exp delete mode 100644 test/default/generichash.exp delete mode 100644 test/default/generichash2.exp delete mode 100644 test/default/generichash3.exp delete mode 100644 test/default/hash.exp delete mode 100644 test/default/hash2.exp delete mode 100644 test/default/hash3.exp delete mode 100644 test/default/onetimeauth.exp delete mode 100644 test/default/onetimeauth2.exp delete mode 100644 test/default/onetimeauth7.exp delete mode 100644 test/default/scalarmult.exp delete mode 100644 test/default/scalarmult2.exp delete mode 100644 test/default/scalarmult5.exp delete mode 100644 test/default/scalarmult6.exp delete mode 100644 test/default/scalarmult7.exp delete mode 100644 test/default/scalarmult8.exp delete mode 100644 test/default/secretbox.exp delete mode 100644 test/default/secretbox2.exp delete mode 100644 test/default/secretbox7.exp delete mode 100644 test/default/secretbox8.exp delete mode 100644 test/default/secretbox_easy.exp delete mode 100644 test/default/secretbox_easy2.exp delete mode 100644 test/default/shorthash.exp delete mode 100644 test/default/sodium_core.exp delete mode 100644 test/default/sodium_utils.exp delete mode 100644 test/default/sodium_version.exp delete mode 100644 test/default/stream.exp delete mode 100644 test/default/stream2.exp delete mode 100644 test/default/stream3.exp delete mode 100644 test/default/stream4.exp delete mode 100644 test/default/stream5.exp delete mode 100644 test/default/stream6.exp 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 From 3019c82a2efd4f0f5e4613e56ae3ee0e84aae959 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Mon, 7 Apr 2014 19:08:39 -0700 Subject: [PATCH 06/57] Update NuGet package. --- packaging/nuget/package.config | 2 +- packaging/nuget/package.nuspec | 50 ++++++++++++++++----------------- packaging/nuget/package.targets | 40 +++++++++++++------------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config index 944772c5..2cc46ae0 100644 --- a/packaging/nuget/package.config +++ b/packaging/nuget/package.config @@ -1,4 +1,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec index 5a9a39de..20dd0f61 100644 --- a/packaging/nuget/package.nuspec +++ b/packaging/nuget/package.nuspec @@ -7,7 +7,7 @@ libsodium_vc120 - 0.4.5.0 + 0.4.5.1 libsodium_vc120 libsodium contributors Eric Voskuil @@ -91,52 +91,52 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - libsodium-x86-v120-mt-s-0_4_5_0.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-s-0_4_5_1.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-sgd-0_4_5_0.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-sgd-0_4_5_1.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-s-0_4_5_0.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-s-0_4_5_1.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-sgd-0_4_5_0.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-sgd-0_4_5_1.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-s-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-s-0_4_5_1.ltcg.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-sgd-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-sgd-0_4_5_1.ltcg.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-s-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-s-0_4_5_1.ltcg.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-sgd-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-sgd-0_4_5_1.ltcg.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-0_4_5_0.imp.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-0_4_5_1.imp.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-gd-0_4_5_0.imp.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-gd-0_4_5_1.imp.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-0_4_5_0.imp.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-0_4_5_1.imp.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-gd-0_4_5_0.imp.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-gd-0_4_5_1.imp.lib;%(AdditionalDependencies) @@ -97,26 +97,26 @@ - - + + - - + + - - + + - - + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + + + + + + SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.imp.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.imp.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.ltcg.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.ltcg.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium.import.xml b/builds/msvc/vs2010/libsodium.import.xml new file mode 100644 index 00000000..dbcf4e5a --- /dev/null +++ b/builds/msvc/vs2010/libsodium.import.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium.sln b/builds/msvc/vs2010/libsodium.sln index 8ca871bf..7feb9c6c 100644 --- a/builds/msvc/vs2010/libsodium.sln +++ b/builds/msvc/vs2010/libsodium.sln @@ -3,6 +3,11 @@ 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 +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 @@ -43,6 +48,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/vs2010/libsodium/libsodium.props b/builds/msvc/vs2010/libsodium/libsodium.props index 0b13e4bf..1aaadddd 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.props +++ b/builds/msvc/vs2010/libsodium/libsodium.props @@ -7,25 +7,15 @@ 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) + SODIUM_STATIC;%(PreprocessorDefinitions) + DLL_EXPORT;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters index 805f7e01..260afb56 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters @@ -391,6 +391,12 @@ src + + src + + + src + diff --git a/builds/msvc/vs2010/test/test.props b/builds/msvc/vs2010/test/test.props new file mode 100644 index 00000000..6cdfca54 --- /dev/null +++ b/builds/msvc/vs2010/test/test.props @@ -0,0 +1,44 @@ + + + + + <_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) + + + + + + + + + + + + dynamic + + + ltcg + + + static + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/test/test.runner.bat b/builds/msvc/vs2010/test/test.runner.bat new file mode 100644 index 00000000..cd7e7914 --- /dev/null +++ b/builds/msvc/vs2010/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/vs2010/test/test.vcxproj b/builds/msvc/vs2010/test/test.vcxproj new file mode 100644 index 00000000..6daaefb3 --- /dev/null +++ b/builds/msvc/vs2010/test/test.vcxproj @@ -0,0 +1,288 @@ + + + + {4EDBA07C-2F08-4C9E-805F-A4921814C117} + test + test10 + + + v100 + 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/vs2010/test/test.vcxproj.filters b/builds/msvc/vs2010/test/test.vcxproj.filters new file mode 100644 index 00000000..a58b55c5 --- /dev/null +++ b/builds/msvc/vs2010/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/builds/msvc/vs2012/libsodium.import.props b/builds/msvc/vs2012/libsodium.import.props new file mode 100644 index 00000000..0e27e5dc --- /dev/null +++ b/builds/msvc/vs2012/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\libsodium11\libsodium.imp.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.imp.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.ltcg.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.ltcg.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium.import.xml b/builds/msvc/vs2012/libsodium.import.xml new file mode 100644 index 00000000..dbcf4e5a --- /dev/null +++ b/builds/msvc/vs2012/libsodium.import.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium.sln b/builds/msvc/vs2012/libsodium.sln index b75f7732..87cf8598 100644 --- a/builds/msvc/vs2012/libsodium.sln +++ b/builds/msvc/vs2012/libsodium.sln @@ -3,6 +3,11 @@ 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 +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 @@ -43,6 +48,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/vs2012/libsodium/libsodium.props b/builds/msvc/vs2012/libsodium/libsodium.props index 0b13e4bf..1aaadddd 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.props +++ b/builds/msvc/vs2012/libsodium/libsodium.props @@ -7,25 +7,15 @@ 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) + SODIUM_STATIC;%(PreprocessorDefinitions) + DLL_EXPORT;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters index 805f7e01..260afb56 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters @@ -391,6 +391,12 @@ src + + src + + + src + diff --git a/builds/msvc/vs2012/test/test.props b/builds/msvc/vs2012/test/test.props new file mode 100644 index 00000000..6cdfca54 --- /dev/null +++ b/builds/msvc/vs2012/test/test.props @@ -0,0 +1,44 @@ + + + + + <_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) + + + + + + + + + + + + dynamic + + + ltcg + + + static + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/test/test.runner.bat b/builds/msvc/vs2012/test/test.runner.bat new file mode 100644 index 00000000..cd7e7914 --- /dev/null +++ b/builds/msvc/vs2012/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/vs2012/test/test.vcxproj b/builds/msvc/vs2012/test/test.vcxproj new file mode 100644 index 00000000..1eea80a4 --- /dev/null +++ b/builds/msvc/vs2012/test/test.vcxproj @@ -0,0 +1,288 @@ + + + + {4EDBA07C-2F08-4C9E-805F-A4921814C117} + test + test11 + + + v110 + 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/vs2012/test/test.vcxproj.filters b/builds/msvc/vs2012/test/test.vcxproj.filters new file mode 100644 index 00000000..a58b55c5 --- /dev/null +++ b/builds/msvc/vs2012/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/builds/msvc/vs2013/libsodium.import.props b/builds/msvc/vs2013/libsodium.import.props index 099e7939..960e2edd 100644 --- a/builds/msvc/vs2013/libsodium.import.props +++ b/builds/msvc/vs2013/libsodium.import.props @@ -12,21 +12,16 @@ - + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) - - - - - - SODIUM_STATIC;%(PreprocessorDefinitions) + SODIUM_STATIC;%(PreprocessorDefinitions) - + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.imp.lib;%(AdditionalDependencies) @@ -53,7 +48,7 @@ - + - + diff --git a/builds/msvc/vs2013/libsodium/libsodium.props b/builds/msvc/vs2013/libsodium/libsodium.props index 0b13e4bf..1aaadddd 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.props +++ b/builds/msvc/vs2013/libsodium/libsodium.props @@ -7,25 +7,15 @@ 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) + SODIUM_STATIC;%(PreprocessorDefinitions) + DLL_EXPORT;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2013/test/test.props b/builds/msvc/vs2013/test/test.props index 7e33471e..6cdfca54 100644 --- a/builds/msvc/vs2013/test/test.props +++ b/builds/msvc/vs2013/test/test.props @@ -13,20 +13,13 @@ $(ProjectDir)..\..\..\..\test\default\;$(ProjectDir)..\..\..\..\test\quirks\;%(AdditionalIncludeDirectories) - false _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - + - - - SODIUM_STATIC;%(PreprocessorDefinitions) - - - - + diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj index 59a61deb..6f4815f7 100644 --- a/builds/msvc/vs2013/test/test.vcxproj +++ b/builds/msvc/vs2013/test/test.vcxproj @@ -11,13 +11,13 @@ - + - + diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl index 9ec8d4c6..f2f07457 100644 --- a/packaging/nuget/package.gsl +++ b/packaging/nuget/package.gsl @@ -23,7 +23,7 @@ https://github.com/jedisct1/libsodium http://upload.wikimedia.org/wikipedia/commons/thumb/7/78/Salt_shaker_on_white_background.jpg/220px-Salt_shaker_on_white_background.jpg true - true + false Sodium is a portable, cross-compilable, installable, packageable fork of NaCl (based on the latest released upstream version nacl-20110221), with a compatible API. Portable fork of NaCl, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers. https://raw.github.com/jedisct1/libsodium/master/ChangeLog From 4b44d01b32937f620c9de518402c6596e536ba8c Mon Sep 17 00:00:00 2001 From: evoskuil Date: Wed, 9 Apr 2014 03:56:03 -0700 Subject: [PATCH 08/57] Restore test files. --- test/default/auth.exp | 4 ++ test/default/auth2.exp | 4 ++ test/default/auth3.exp | 1 + test/default/auth5.exp | 0 test/default/box.exp | 19 ++++++++++ test/default/box2.exp | 17 +++++++++ test/default/box7.exp | 0 test/default/box8.exp | 0 test/default/box_easy.exp | 19 ++++++++++ test/default/box_easy2.exp | 1 + test/default/core1.exp | 4 ++ test/default/core2.exp | 4 ++ test/default/core3.exp | 1 + test/default/core4.exp | 8 ++++ test/default/core5.exp | 4 ++ test/default/core6.exp | 4 ++ test/default/generichash.exp | 64 ++++++++++++++++++++++++++++++++ test/default/generichash2.exp | 64 ++++++++++++++++++++++++++++++++ test/default/generichash3.exp | 64 ++++++++++++++++++++++++++++++++ test/default/hash.exp | 1 + test/default/hash2.exp | 1 + test/default/hash3.exp | 1 + test/default/onetimeauth.exp | 2 + test/default/onetimeauth2.exp | 1 + test/default/onetimeauth7.exp | 0 test/default/scalarmult.exp | 4 ++ test/default/scalarmult2.exp | 4 ++ test/default/scalarmult5.exp | 4 ++ test/default/scalarmult6.exp | 4 ++ test/default/scalarmult7.exp | 1 + test/default/scalarmult8.exp | 1 + test/default/secretbox.exp | 19 ++++++++++ test/default/secretbox2.exp | 17 +++++++++ test/default/secretbox7.exp | 0 test/default/secretbox8.exp | 0 test/default/secretbox_easy.exp | 19 ++++++++++ test/default/secretbox_easy2.exp | 1 + test/default/shorthash.exp | 64 ++++++++++++++++++++++++++++++++ test/default/sodium_core.exp | 1 + test/default/sodium_utils.exp | 6 +++ test/default/sodium_version.exp | 3 ++ test/default/stream.exp | 1 + test/default/stream2.exp | 1 + test/default/stream3.exp | 4 ++ test/default/stream4.exp | 17 +++++++++ test/default/stream5.exp | 1 + test/default/stream6.exp | 17 +++++++++ 47 files changed, 477 insertions(+) create mode 100644 test/default/auth.exp create mode 100644 test/default/auth2.exp create mode 100644 test/default/auth3.exp create mode 100644 test/default/auth5.exp create mode 100644 test/default/box.exp create mode 100644 test/default/box2.exp create mode 100644 test/default/box7.exp create mode 100644 test/default/box8.exp create mode 100644 test/default/box_easy.exp create mode 100644 test/default/box_easy2.exp create mode 100644 test/default/core1.exp create mode 100644 test/default/core2.exp create mode 100644 test/default/core3.exp create mode 100644 test/default/core4.exp create mode 100644 test/default/core5.exp create mode 100644 test/default/core6.exp create mode 100644 test/default/generichash.exp create mode 100644 test/default/generichash2.exp create mode 100644 test/default/generichash3.exp create mode 100644 test/default/hash.exp create mode 100644 test/default/hash2.exp create mode 100644 test/default/hash3.exp create mode 100644 test/default/onetimeauth.exp create mode 100644 test/default/onetimeauth2.exp create mode 100644 test/default/onetimeauth7.exp create mode 100644 test/default/scalarmult.exp create mode 100644 test/default/scalarmult2.exp create mode 100644 test/default/scalarmult5.exp create mode 100644 test/default/scalarmult6.exp create mode 100644 test/default/scalarmult7.exp create mode 100644 test/default/scalarmult8.exp create mode 100644 test/default/secretbox.exp create mode 100644 test/default/secretbox2.exp create mode 100644 test/default/secretbox7.exp create mode 100644 test/default/secretbox8.exp create mode 100644 test/default/secretbox_easy.exp create mode 100644 test/default/secretbox_easy2.exp create mode 100644 test/default/shorthash.exp create mode 100644 test/default/sodium_core.exp create mode 100644 test/default/sodium_utils.exp create mode 100644 test/default/sodium_version.exp create mode 100644 test/default/stream.exp create mode 100644 test/default/stream2.exp create mode 100644 test/default/stream3.exp create mode 100644 test/default/stream4.exp create mode 100644 test/default/stream5.exp create mode 100644 test/default/stream6.exp diff --git a/test/default/auth.exp b/test/default/auth.exp new file mode 100644 index 00000000..35e5909d --- /dev/null +++ b/test/default/auth.exp @@ -0,0 +1,4 @@ +,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 new file mode 100644 index 00000000..955951a2 --- /dev/null +++ b/test/default/auth2.exp @@ -0,0 +1,4 @@ +,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 new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/test/default/auth3.exp @@ -0,0 +1 @@ +0 diff --git a/test/default/auth5.exp b/test/default/auth5.exp new file mode 100644 index 00000000..e69de29b diff --git a/test/default/box.exp b/test/default/box.exp new file mode 100644 index 00000000..2b6c51ea --- /dev/null +++ b/test/default/box.exp @@ -0,0 +1,19 @@ +,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 new file mode 100644 index 00000000..c61d4557 --- /dev/null +++ b/test/default/box2.exp @@ -0,0 +1,17 @@ +,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 new file mode 100644 index 00000000..e69de29b diff --git a/test/default/box8.exp b/test/default/box8.exp new file mode 100644 index 00000000..e69de29b diff --git a/test/default/box_easy.exp b/test/default/box_easy.exp new file mode 100644 index 00000000..2b6c51ea --- /dev/null +++ b/test/default/box_easy.exp @@ -0,0 +1,19 @@ +,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 new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/test/default/box_easy2.exp @@ -0,0 +1 @@ +0 diff --git a/test/default/core1.exp b/test/default/core1.exp new file mode 100644 index 00000000..715a489d --- /dev/null +++ b/test/default/core1.exp @@ -0,0 +1,4 @@ + 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 new file mode 100644 index 00000000..f4682af0 --- /dev/null +++ b/test/default/core2.exp @@ -0,0 +1,4 @@ + 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 new file mode 100644 index 00000000..5fa208c1 --- /dev/null +++ b/test/default/core3.exp @@ -0,0 +1 @@ +662b9d0e3463029156069b12f918691a98f7dfb2ca0393c96bbfc6b1fbd630a2 diff --git a/test/default/core4.exp b/test/default/core4.exp new file mode 100644 index 00000000..d04e5b5e --- /dev/null +++ b/test/default/core4.exp @@ -0,0 +1,8 @@ + 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 new file mode 100644 index 00000000..562cf717 --- /dev/null +++ b/test/default/core5.exp @@ -0,0 +1,4 @@ +,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 new file mode 100644 index 00000000..562cf717 --- /dev/null +++ b/test/default/core6.exp @@ -0,0 +1,4 @@ +,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 new file mode 100644 index 00000000..1840ff24 --- /dev/null +++ b/test/default/generichash.exp @@ -0,0 +1,64 @@ +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 new file mode 100644 index 00000000..5ee6f605 --- /dev/null +++ b/test/default/generichash2.exp @@ -0,0 +1,64 @@ +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 new file mode 100644 index 00000000..f81d8e22 --- /dev/null +++ b/test/default/generichash3.exp @@ -0,0 +1,64 @@ +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 new file mode 100644 index 00000000..df582172 --- /dev/null +++ b/test/default/hash.exp @@ -0,0 +1 @@ +24f950aac7b9ea9b3cb728228a0c82b67c39e96b4b344798870d5daee93e3ae5931baae8c7cacfea4b629452c38026a81d138bc7aad1af3ef7bfd5ec646d6c28 diff --git a/test/default/hash2.exp b/test/default/hash2.exp new file mode 100644 index 00000000..df582172 --- /dev/null +++ b/test/default/hash2.exp @@ -0,0 +1 @@ +24f950aac7b9ea9b3cb728228a0c82b67c39e96b4b344798870d5daee93e3ae5931baae8c7cacfea4b629452c38026a81d138bc7aad1af3ef7bfd5ec646d6c28 diff --git a/test/default/hash3.exp b/test/default/hash3.exp new file mode 100644 index 00000000..df582172 --- /dev/null +++ b/test/default/hash3.exp @@ -0,0 +1 @@ +24f950aac7b9ea9b3cb728228a0c82b67c39e96b4b344798870d5daee93e3ae5931baae8c7cacfea4b629452c38026a81d138bc7aad1af3ef7bfd5ec646d6c28 diff --git a/test/default/onetimeauth.exp b/test/default/onetimeauth.exp new file mode 100644 index 00000000..6d914615 --- /dev/null +++ b/test/default/onetimeauth.exp @@ -0,0 +1,2 @@ +,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 new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/test/default/onetimeauth2.exp @@ -0,0 +1 @@ +0 diff --git a/test/default/onetimeauth7.exp b/test/default/onetimeauth7.exp new file mode 100644 index 00000000..e69de29b diff --git a/test/default/scalarmult.exp b/test/default/scalarmult.exp new file mode 100644 index 00000000..ddd130d6 --- /dev/null +++ b/test/default/scalarmult.exp @@ -0,0 +1,4 @@ + 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 new file mode 100644 index 00000000..b5391865 --- /dev/null +++ b/test/default/scalarmult2.exp @@ -0,0 +1,4 @@ + 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 new file mode 100644 index 00000000..bec21130 --- /dev/null +++ b/test/default/scalarmult5.exp @@ -0,0 +1,4 @@ + 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 new file mode 100644 index 00000000..bec21130 --- /dev/null +++ b/test/default/scalarmult6.exp @@ -0,0 +1,4 @@ + 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.exp b/test/default/scalarmult7.exp new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/test/default/scalarmult7.exp @@ -0,0 +1 @@ +0 diff --git a/test/default/scalarmult8.exp b/test/default/scalarmult8.exp new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/test/default/scalarmult8.exp @@ -0,0 +1 @@ +0 diff --git a/test/default/secretbox.exp b/test/default/secretbox.exp new file mode 100644 index 00000000..2b6c51ea --- /dev/null +++ b/test/default/secretbox.exp @@ -0,0 +1,19 @@ +,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 new file mode 100644 index 00000000..c61d4557 --- /dev/null +++ b/test/default/secretbox2.exp @@ -0,0 +1,17 @@ +,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 new file mode 100644 index 00000000..e69de29b diff --git a/test/default/secretbox8.exp b/test/default/secretbox8.exp new file mode 100644 index 00000000..e69de29b diff --git a/test/default/secretbox_easy.exp b/test/default/secretbox_easy.exp new file mode 100644 index 00000000..2b6c51ea --- /dev/null +++ b/test/default/secretbox_easy.exp @@ -0,0 +1,19 @@ +,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 new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/test/default/secretbox_easy2.exp @@ -0,0 +1 @@ +0 diff --git a/test/default/shorthash.exp b/test/default/shorthash.exp new file mode 100644 index 00000000..6ec8684d --- /dev/null +++ b/test/default/shorthash.exp @@ -0,0 +1,64 @@ +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 new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/test/default/sodium_core.exp @@ -0,0 +1 @@ +1 diff --git a/test/default/sodium_utils.exp b/test/default/sodium_utils.exp new file mode 100644 index 00000000..713a1d9b --- /dev/null +++ b/test/default/sodium_utils.exp @@ -0,0 +1,6 @@ +0 +0 +-1 +0 +0 +30313233343536373839414243444546 diff --git a/test/default/sodium_version.exp b/test/default/sodium_version.exp new file mode 100644 index 00000000..e8183f05 --- /dev/null +++ b/test/default/sodium_version.exp @@ -0,0 +1,3 @@ +1 +1 +1 diff --git a/test/default/stream.exp b/test/default/stream.exp new file mode 100644 index 00000000..5fa208c1 --- /dev/null +++ b/test/default/stream.exp @@ -0,0 +1 @@ +662b9d0e3463029156069b12f918691a98f7dfb2ca0393c96bbfc6b1fbd630a2 diff --git a/test/default/stream2.exp b/test/default/stream2.exp new file mode 100644 index 00000000..5fa208c1 --- /dev/null +++ b/test/default/stream2.exp @@ -0,0 +1 @@ +662b9d0e3463029156069b12f918691a98f7dfb2ca0393c96bbfc6b1fbd630a2 diff --git a/test/default/stream3.exp b/test/default/stream3.exp new file mode 100644 index 00000000..9cd78798 --- /dev/null +++ b/test/default/stream3.exp @@ -0,0 +1,4 @@ +,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 new file mode 100644 index 00000000..0d3d8e94 --- /dev/null +++ b/test/default/stream4.exp @@ -0,0 +1,17 @@ +,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 new file mode 100644 index 00000000..d55bf9f9 --- /dev/null +++ b/test/default/stream5.exp @@ -0,0 +1 @@ +b5d3f979ab4a760787484b4e0cf7c82db358b06fdf365cc7d456cc91258af618 diff --git a/test/default/stream6.exp b/test/default/stream6.exp new file mode 100644 index 00000000..a74aee22 --- /dev/null +++ b/test/default/stream6.exp @@ -0,0 +1,17 @@ +,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 From d36bcc85b573adf158f4fece5ae84dd4e886cc9d Mon Sep 17 00:00:00 2001 From: evoskuil Date: Mon, 14 Apr 2014 17:54:49 -0700 Subject: [PATCH 09/57] Remove versioning from .props files. --- builds/msvc/vs2010/libsodium.import.props | 3 +-- builds/msvc/vs2010/libsodium/libsodium.props | 3 +-- builds/msvc/vs2010/properties/Common.props | 3 +-- builds/msvc/vs2010/properties/Console.props | 3 +-- builds/msvc/vs2010/properties/ConsoleDebugDynamic.props | 3 +-- .../vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2010/properties/ConsoleDebugStatic.props | 3 +-- builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props | 3 +-- .../properties/ConsoleReleaseLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2010/properties/ConsoleReleaseStatic.props | 3 +-- builds/msvc/vs2010/properties/Debug.props | 3 +-- builds/msvc/vs2010/properties/Dynamic.props | 3 +-- builds/msvc/vs2010/properties/DynamicDebug.props | 3 +-- builds/msvc/vs2010/properties/DynamicRelease.props | 3 +-- builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2010/properties/Release.props | 3 +-- builds/msvc/vs2010/properties/Static.props | 3 +-- builds/msvc/vs2010/properties/StaticDebug.props | 3 +-- .../vs2010/properties/StaticDebugLinkTimeCodeGeneration.props | 3 +-- .../msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2010/properties/StaticRelease.props | 3 +-- .../properties/StaticReleaseLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2010/properties/Win32.props | 3 +-- builds/msvc/vs2010/properties/x64.props | 3 +-- builds/msvc/vs2010/test/test.props | 3 +-- builds/msvc/vs2012/libsodium.import.props | 3 +-- builds/msvc/vs2012/libsodium/libsodium.props | 3 +-- builds/msvc/vs2012/properties/Common.props | 3 +-- builds/msvc/vs2012/properties/Console.props | 3 +-- builds/msvc/vs2012/properties/ConsoleDebugDynamic.props | 3 +-- .../vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2012/properties/ConsoleDebugStatic.props | 3 +-- builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props | 3 +-- .../properties/ConsoleReleaseLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2012/properties/ConsoleReleaseStatic.props | 3 +-- builds/msvc/vs2012/properties/Debug.props | 3 +-- builds/msvc/vs2012/properties/Dynamic.props | 3 +-- builds/msvc/vs2012/properties/DynamicDebug.props | 3 +-- builds/msvc/vs2012/properties/DynamicRelease.props | 3 +-- builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2012/properties/Release.props | 3 +-- builds/msvc/vs2012/properties/Static.props | 3 +-- builds/msvc/vs2012/properties/StaticDebug.props | 3 +-- .../vs2012/properties/StaticDebugLinkTimeCodeGeneration.props | 3 +-- .../msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2012/properties/StaticRelease.props | 3 +-- .../properties/StaticReleaseLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2012/properties/Win32.props | 3 +-- builds/msvc/vs2012/properties/x64.props | 3 +-- builds/msvc/vs2012/test/test.props | 3 +-- builds/msvc/vs2013/libsodium.import.props | 3 +-- builds/msvc/vs2013/libsodium/libsodium.props | 3 +-- builds/msvc/vs2013/properties/Common.props | 3 +-- builds/msvc/vs2013/properties/Console.props | 3 +-- builds/msvc/vs2013/properties/ConsoleDebugDynamic.props | 3 +-- .../vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2013/properties/ConsoleDebugStatic.props | 3 +-- builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props | 3 +-- .../properties/ConsoleReleaseLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2013/properties/ConsoleReleaseStatic.props | 3 +-- builds/msvc/vs2013/properties/Debug.props | 3 +-- builds/msvc/vs2013/properties/Dynamic.props | 3 +-- builds/msvc/vs2013/properties/DynamicDebug.props | 3 +-- builds/msvc/vs2013/properties/DynamicRelease.props | 3 +-- builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2013/properties/Release.props | 3 +-- builds/msvc/vs2013/properties/Static.props | 3 +-- builds/msvc/vs2013/properties/StaticDebug.props | 3 +-- .../vs2013/properties/StaticDebugLinkTimeCodeGeneration.props | 3 +-- .../msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2013/properties/StaticRelease.props | 3 +-- .../properties/StaticReleaseLinkTimeCodeGeneration.props | 3 +-- builds/msvc/vs2013/properties/Win32.props | 3 +-- builds/msvc/vs2013/properties/x64.props | 3 +-- builds/msvc/vs2013/test/test.props | 3 +-- 75 files changed, 75 insertions(+), 150 deletions(-) diff --git a/builds/msvc/vs2010/libsodium.import.props b/builds/msvc/vs2010/libsodium.import.props index 9a99828f..9ac8df1e 100644 --- a/builds/msvc/vs2010/libsodium.import.props +++ b/builds/msvc/vs2010/libsodium.import.props @@ -1,8 +1,7 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Libsodium Import Settings diff --git a/builds/msvc/vs2010/libsodium/libsodium.props b/builds/msvc/vs2010/libsodium/libsodium.props index 1aaadddd..33c2c1a6 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.props +++ b/builds/msvc/vs2010/libsodium/libsodium.props @@ -1,8 +1,7 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Libsodium Common Settings AllRules.ruleset false diff --git a/builds/msvc/vs2010/properties/Common.props b/builds/msvc/vs2010/properties/Common.props index 79b0b6c5..2acf2e6f 100644 --- a/builds/msvc/vs2010/properties/Common.props +++ b/builds/msvc/vs2010/properties/Common.props @@ -1,8 +1,7 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Common Settings Unicode $(ProjectName) diff --git a/builds/msvc/vs2010/properties/Console.props b/builds/msvc/vs2010/properties/Console.props index 84728193..414c98ae 100644 --- a/builds/msvc/vs2010/properties/Console.props +++ b/builds/msvc/vs2010/properties/Console.props @@ -1,12 +1,11 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Console Application diff --git a/builds/msvc/vs2010/properties/ConsoleDebugDynamic.props b/builds/msvc/vs2010/properties/ConsoleDebugDynamic.props index c193c5e0..5872b5c4 100644 --- a/builds/msvc/vs2010/properties/ConsoleDebugDynamic.props +++ b/builds/msvc/vs2010/properties/ConsoleDebugDynamic.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Console Debug Dynamic diff --git a/builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props index 51d58a70..1e752c21 100644 --- a/builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props +++ b/builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props @@ -1,5 +1,5 @@  - + @@ -8,7 +8,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Console Debug Link Time Code Generation Library diff --git a/builds/msvc/vs2010/properties/ConsoleDebugStatic.props b/builds/msvc/vs2010/properties/ConsoleDebugStatic.props index 019f74cd..5d72bbc4 100644 --- a/builds/msvc/vs2010/properties/ConsoleDebugStatic.props +++ b/builds/msvc/vs2010/properties/ConsoleDebugStatic.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Console Debug Static diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props b/builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props index beacefae..f15070dd 100644 --- a/builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props +++ b/builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Console Release Dynamic diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props index 491419a8..984891b3 100644 --- a/builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props +++ b/builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props @@ -1,5 +1,5 @@  - + @@ -8,7 +8,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Console Release Link Time Code Generation Library diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseStatic.props b/builds/msvc/vs2010/properties/ConsoleReleaseStatic.props index 3ada6cc5..2aaf3032 100644 --- a/builds/msvc/vs2010/properties/ConsoleReleaseStatic.props +++ b/builds/msvc/vs2010/properties/ConsoleReleaseStatic.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Console Release Static diff --git a/builds/msvc/vs2010/properties/Debug.props b/builds/msvc/vs2010/properties/Debug.props index 7f060f47..a2867772 100644 --- a/builds/msvc/vs2010/properties/Debug.props +++ b/builds/msvc/vs2010/properties/Debug.props @@ -1,8 +1,7 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Debug Configuration $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ diff --git a/builds/msvc/vs2010/properties/Dynamic.props b/builds/msvc/vs2010/properties/Dynamic.props index 8f57f137..9e749175 100644 --- a/builds/msvc/vs2010/properties/Dynamic.props +++ b/builds/msvc/vs2010/properties/Dynamic.props @@ -1,12 +1,11 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Dynamic Library diff --git a/builds/msvc/vs2010/properties/DynamicDebug.props b/builds/msvc/vs2010/properties/DynamicDebug.props index 03954333..ee40a01f 100644 --- a/builds/msvc/vs2010/properties/DynamicDebug.props +++ b/builds/msvc/vs2010/properties/DynamicDebug.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Dynamic Debug Library diff --git a/builds/msvc/vs2010/properties/DynamicRelease.props b/builds/msvc/vs2010/properties/DynamicRelease.props index 1b1de610..c3f36f89 100644 --- a/builds/msvc/vs2010/properties/DynamicRelease.props +++ b/builds/msvc/vs2010/properties/DynamicRelease.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Dynamic Release Library diff --git a/builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props index 338a9704..644462f0 100644 --- a/builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props +++ b/builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props @@ -1,8 +1,7 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Link Time Code Generation Library diff --git a/builds/msvc/vs2010/properties/Release.props b/builds/msvc/vs2010/properties/Release.props index aff972fd..c2111288 100644 --- a/builds/msvc/vs2010/properties/Release.props +++ b/builds/msvc/vs2010/properties/Release.props @@ -1,8 +1,7 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Release Configuration $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ diff --git a/builds/msvc/vs2010/properties/Static.props b/builds/msvc/vs2010/properties/Static.props index 9b30a132..85207e49 100644 --- a/builds/msvc/vs2010/properties/Static.props +++ b/builds/msvc/vs2010/properties/Static.props @@ -1,12 +1,11 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Library diff --git a/builds/msvc/vs2010/properties/StaticDebug.props b/builds/msvc/vs2010/properties/StaticDebug.props index b5e5ba9a..8668424c 100644 --- a/builds/msvc/vs2010/properties/StaticDebug.props +++ b/builds/msvc/vs2010/properties/StaticDebug.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Debug Library diff --git a/builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props index ae5f3504..a35e0e7a 100644 --- a/builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props +++ b/builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library diff --git a/builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props index 8009311c..6a8d8837 100644 --- a/builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props +++ b/builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Link Time Code Generation Library $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ diff --git a/builds/msvc/vs2012/properties/Dynamic.props b/builds/msvc/vs2012/properties/Dynamic.props index 8f57f137..9e749175 100644 --- a/builds/msvc/vs2012/properties/Dynamic.props +++ b/builds/msvc/vs2012/properties/Dynamic.props @@ -1,12 +1,11 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Dynamic Library diff --git a/builds/msvc/vs2012/properties/DynamicDebug.props b/builds/msvc/vs2012/properties/DynamicDebug.props index 03954333..ee40a01f 100644 --- a/builds/msvc/vs2012/properties/DynamicDebug.props +++ b/builds/msvc/vs2012/properties/DynamicDebug.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Dynamic Debug Library diff --git a/builds/msvc/vs2012/properties/DynamicRelease.props b/builds/msvc/vs2012/properties/DynamicRelease.props index 1b1de610..c3f36f89 100644 --- a/builds/msvc/vs2012/properties/DynamicRelease.props +++ b/builds/msvc/vs2012/properties/DynamicRelease.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Dynamic Release Library diff --git a/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props index 338a9704..644462f0 100644 --- a/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props +++ b/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props @@ -1,8 +1,7 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Link Time Code Generation Library diff --git a/builds/msvc/vs2012/properties/Release.props b/builds/msvc/vs2012/properties/Release.props index aff972fd..c2111288 100644 --- a/builds/msvc/vs2012/properties/Release.props +++ b/builds/msvc/vs2012/properties/Release.props @@ -1,8 +1,7 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Release Configuration $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ diff --git a/builds/msvc/vs2012/properties/Static.props b/builds/msvc/vs2012/properties/Static.props index 9b30a132..85207e49 100644 --- a/builds/msvc/vs2012/properties/Static.props +++ b/builds/msvc/vs2012/properties/Static.props @@ -1,12 +1,11 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Library diff --git a/builds/msvc/vs2012/properties/StaticDebug.props b/builds/msvc/vs2012/properties/StaticDebug.props index b5e5ba9a..8668424c 100644 --- a/builds/msvc/vs2012/properties/StaticDebug.props +++ b/builds/msvc/vs2012/properties/StaticDebug.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Debug Library diff --git a/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props index ae5f3504..a35e0e7a 100644 --- a/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props +++ b/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library diff --git a/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props index 8009311c..6a8d8837 100644 --- a/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props +++ b/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Link Time Code Generation Library $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ diff --git a/builds/msvc/vs2013/properties/Dynamic.props b/builds/msvc/vs2013/properties/Dynamic.props index 8f57f137..9e749175 100644 --- a/builds/msvc/vs2013/properties/Dynamic.props +++ b/builds/msvc/vs2013/properties/Dynamic.props @@ -1,12 +1,11 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Dynamic Library diff --git a/builds/msvc/vs2013/properties/DynamicDebug.props b/builds/msvc/vs2013/properties/DynamicDebug.props index 03954333..ee40a01f 100644 --- a/builds/msvc/vs2013/properties/DynamicDebug.props +++ b/builds/msvc/vs2013/properties/DynamicDebug.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Dynamic Debug Library diff --git a/builds/msvc/vs2013/properties/DynamicRelease.props b/builds/msvc/vs2013/properties/DynamicRelease.props index 1b1de610..c3f36f89 100644 --- a/builds/msvc/vs2013/properties/DynamicRelease.props +++ b/builds/msvc/vs2013/properties/DynamicRelease.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Dynamic Release Library diff --git a/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props index 338a9704..644462f0 100644 --- a/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props +++ b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props @@ -1,8 +1,7 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Link Time Code Generation Library diff --git a/builds/msvc/vs2013/properties/Release.props b/builds/msvc/vs2013/properties/Release.props index aff972fd..c2111288 100644 --- a/builds/msvc/vs2013/properties/Release.props +++ b/builds/msvc/vs2013/properties/Release.props @@ -1,8 +1,7 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Release Configuration $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ diff --git a/builds/msvc/vs2013/properties/Static.props b/builds/msvc/vs2013/properties/Static.props index 9b30a132..85207e49 100644 --- a/builds/msvc/vs2013/properties/Static.props +++ b/builds/msvc/vs2013/properties/Static.props @@ -1,12 +1,11 @@  - + - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Library diff --git a/builds/msvc/vs2013/properties/StaticDebug.props b/builds/msvc/vs2013/properties/StaticDebug.props index b5e5ba9a..8668424c 100644 --- a/builds/msvc/vs2013/properties/StaticDebug.props +++ b/builds/msvc/vs2013/properties/StaticDebug.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Debug Library diff --git a/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props index ae5f3504..a35e0e7a 100644 --- a/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props +++ b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library diff --git a/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props index 8009311c..6a8d8837 100644 --- a/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props +++ b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - <_ProjectFileVersion>10.0.40219.1 <_PropertySheetDisplayName>Static Link Time Code Generation Library + true + @@ -246,13 +249,10 @@ - - - + - @@ -266,6 +266,10 @@ + + + true + diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj index b80226b6..2f7b0048 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -169,6 +169,7 @@ + @@ -182,8 +183,6 @@ - - @@ -223,12 +222,16 @@ - - + + + + + true + @@ -246,13 +249,10 @@ - - - + - @@ -266,6 +266,10 @@ + + + true + diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index cb6f6c36..80fb7a13 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -169,6 +169,7 @@ + @@ -182,8 +183,6 @@ - - @@ -223,8 +222,8 @@ - - + + @@ -250,13 +249,10 @@ - - - + - From 82657cef0a64a5656e2be9eca3c9ab214edc86ff Mon Sep 17 00:00:00 2001 From: evoskuil Date: Mon, 14 Apr 2014 23:41:15 -0700 Subject: [PATCH 39/57] Update filters for source file changes. --- .../libsodium/libsodium.vcxproj.filters | 36 +++++++------------ .../libsodium/libsodium.vcxproj.filters | 36 +++++++------------ .../libsodium/libsodium.vcxproj.filters | 36 +++++++------------ 3 files changed, 36 insertions(+), 72 deletions(-) diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters index 260afb56..8beab140 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters @@ -31,9 +31,6 @@ src - - src - src @@ -226,9 +223,6 @@ src - - src - src @@ -238,15 +232,6 @@ src - - src - - - src - - - src - src @@ -364,9 +349,6 @@ src - - src - src @@ -397,6 +379,15 @@ src + + src + + + src + + + src + @@ -444,12 +435,6 @@ include - - include - - - include - include @@ -552,6 +537,9 @@ resource + + include + diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters index 260afb56..8beab140 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters @@ -31,9 +31,6 @@ src - - src - src @@ -226,9 +223,6 @@ src - - src - src @@ -238,15 +232,6 @@ src - - src - - - src - - - src - src @@ -364,9 +349,6 @@ src - - src - src @@ -397,6 +379,15 @@ src + + src + + + src + + + src + @@ -444,12 +435,6 @@ include - - include - - - include - include @@ -552,6 +537,9 @@ resource + + include + diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters index 260afb56..8beab140 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters @@ -31,9 +31,6 @@ src - - src - src @@ -226,9 +223,6 @@ src - - src - src @@ -238,15 +232,6 @@ src - - src - - - src - - - src - src @@ -364,9 +349,6 @@ src - - src - src @@ -397,6 +379,15 @@ src + + src + + + src + + + src + @@ -444,12 +435,6 @@ include - - include - - - include - include @@ -552,6 +537,9 @@ resource + + include + From 34509b99d9c08277b1374e09626254af93fac851 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Tue, 15 Apr 2014 01:43:42 -0700 Subject: [PATCH 40/57] Update filter file tool versions. --- builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters | 8 ++++---- builds/msvc/vs2010/test/test.vcxproj.filters | 2 +- builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters | 8 ++++---- builds/msvc/vs2012/test/test.vcxproj.filters | 2 +- builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters | 8 ++++---- builds/msvc/vs2013/test/test.vcxproj.filters | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters index 8beab140..b8283a71 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters @@ -1,5 +1,5 @@  - + src @@ -545,9 +545,6 @@ packaging - - packaging - packaging @@ -557,6 +554,9 @@ packaging + + packaging + diff --git a/builds/msvc/vs2010/test/test.vcxproj.filters b/builds/msvc/vs2010/test/test.vcxproj.filters index a58b55c5..e959e04d 100644 --- a/builds/msvc/vs2010/test/test.vcxproj.filters +++ b/builds/msvc/vs2010/test/test.vcxproj.filters @@ -1,5 +1,5 @@  - + src diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters index 8beab140..b8283a71 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters @@ -1,5 +1,5 @@  - + src @@ -545,9 +545,6 @@ packaging - - packaging - packaging @@ -557,6 +554,9 @@ packaging + + packaging + diff --git a/builds/msvc/vs2012/test/test.vcxproj.filters b/builds/msvc/vs2012/test/test.vcxproj.filters index a58b55c5..e959e04d 100644 --- a/builds/msvc/vs2012/test/test.vcxproj.filters +++ b/builds/msvc/vs2012/test/test.vcxproj.filters @@ -1,5 +1,5 @@  - + src diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters index 8beab140..b8283a71 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters @@ -1,5 +1,5 @@  - + src @@ -545,9 +545,6 @@ packaging - - packaging - packaging @@ -557,6 +554,9 @@ packaging + + packaging + diff --git a/builds/msvc/vs2013/test/test.vcxproj.filters b/builds/msvc/vs2013/test/test.vcxproj.filters index a58b55c5..e959e04d 100644 --- a/builds/msvc/vs2013/test/test.vcxproj.filters +++ b/builds/msvc/vs2013/test/test.vcxproj.filters @@ -1,5 +1,5 @@  - + src From d83a5289537fdb34fb4afa8db8666d2f7378b349 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 14 Apr 2014 20:42:37 -0700 Subject: [PATCH 41/57] Make hash_sha512 / hmac_sha512256 consistent with hash_sha256 / hmac_sha256 --- AUTHORS | 16 +- libsodium.vcxproj | 8 +- libsodium.vcxproj.filters | 12 +- src/libsodium/Makefile.am | 12 +- .../hmacsha512256/{ref => cp}/api.h | 0 .../hmacsha512256/cp/hmac_hmacsha512256.c | 140 ++++++++ .../{ref => cp}/verify_hmacsha512256.c | 0 .../hmacsha512256/ref/hmac_hmacsha512256.c | 86 ----- .../crypto_hash/sha256/cp/hash_sha256.c | 4 +- .../crypto_hash/sha512/{ref => cp}/api.h | 3 + .../crypto_hash/sha512/cp/hash_sha512.c | 322 ++++++++++++++++++ .../crypto_hash/sha512/ref/hash_sha512.c | 71 ---- .../crypto_hashblocks/sha512/checksum | 1 - .../crypto_hashblocks/sha512/ref/api.h | 9 - .../sha512/ref/blocks_sha512.c | 239 ------------- src/libsodium/crypto_hashblocks/try.c | 78 ----- src/libsodium/include/Makefile.am | 1 - .../sodium/_crypto_hashblocks_sha512.h | 24 -- .../include/sodium/crypto_auth_hmacsha256.h | 4 +- .../sodium/crypto_auth_hmacsha512256.h | 12 +- .../include/sodium/crypto_hash_sha256.h | 2 +- .../include/sodium/crypto_hash_sha512.h | 23 +- 22 files changed, 521 insertions(+), 546 deletions(-) rename src/libsodium/crypto_auth/hmacsha512256/{ref => cp}/api.h (100%) create mode 100644 src/libsodium/crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c rename src/libsodium/crypto_auth/hmacsha512256/{ref => cp}/verify_hmacsha512256.c (100%) delete mode 100644 src/libsodium/crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c rename src/libsodium/crypto_hash/sha512/{ref => cp}/api.h (65%) create mode 100644 src/libsodium/crypto_hash/sha512/cp/hash_sha512.c delete mode 100644 src/libsodium/crypto_hash/sha512/ref/hash_sha512.c delete mode 100644 src/libsodium/crypto_hashblocks/sha512/checksum delete mode 100644 src/libsodium/crypto_hashblocks/sha512/ref/api.h delete mode 100644 src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c delete mode 100644 src/libsodium/crypto_hashblocks/try.c delete mode 100644 src/libsodium/include/sodium/_crypto_hashblocks_sha512.h diff --git a/AUTHORS b/AUTHORS index 6e7d624a..7dfb08d1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -30,19 +30,19 @@ Daniel J. Bernstein crypto_hash/sha256 ------------------ -Daniel J. Bernstein (wrapper around crypto_hashblocks/sha256) +Colin Percival crypto_hash/sha512 ------------------ -Daniel J. Bernstein (wrapper around crypto_hashblocks/sha512) +Colin Percival -crypto_hashblocks/sha256 ------------------------- -Daniel J. Bernstein +crypto_auth/hmacsha256 +------------------ +Colin Percival -crypto_hashblocks/sha512 ------------------------- -Daniel J. Bernstein +crypto_auth/hmacsha512 +------------------ +Colin Percival crypto_scalarmult/curve25519/ref -------------------------------- diff --git a/libsodium.vcxproj b/libsodium.vcxproj index 6ca8ee20..4b723ccb 100644 --- a/libsodium.vcxproj +++ b/libsodium.vcxproj @@ -328,7 +328,6 @@ - @@ -376,8 +375,8 @@ - - + + @@ -396,12 +395,11 @@ - - + diff --git a/libsodium.vcxproj.filters b/libsodium.vcxproj.filters index 96890124..e766cc40 100644 --- a/libsodium.vcxproj.filters +++ b/libsodium.vcxproj.filters @@ -60,9 +60,6 @@ Header Files - - Header Files - Header Files @@ -202,13 +199,13 @@ Source Files - + Source Files Source Files - + Source Files @@ -259,15 +256,12 @@ Source Files - + Source Files Source Files - - Source Files - Source Files diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index 13e51d5a..13da6ec6 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -8,9 +8,9 @@ libsodium_la_SOURCES = \ crypto_auth/hmacsha256/cp/hmac_hmacsha256.c \ crypto_auth/hmacsha256/cp/verify_hmacsha256.c \ crypto_auth/hmacsha512256/auth_hmacsha512256_api.c \ - crypto_auth/hmacsha512256/ref/api.h \ - crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c \ - crypto_auth/hmacsha512256/ref/verify_hmacsha512256.c \ + crypto_auth/hmacsha512256/cp/api.h \ + crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c \ + crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c \ crypto_box/crypto_box.c \ crypto_box/crypto_box_easy.c \ crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305_api.c \ @@ -43,10 +43,8 @@ libsodium_la_SOURCES = \ crypto_hash/sha256/cp/api.h \ crypto_hash/sha256/cp/hash_sha256.c \ crypto_hash/sha512/hash_sha512_api.c \ - crypto_hash/sha512/ref/api.h \ - crypto_hash/sha512/ref/hash_sha512.c \ - crypto_hashblocks/sha512/ref/blocks_sha512.c \ - crypto_hashblocks/sha512/ref/api.h \ + crypto_hash/sha512/cp/api.h \ + crypto_hash/sha512/cp/hash_sha512.c \ crypto_onetimeauth/crypto_onetimeauth.c \ crypto_onetimeauth/poly1305/onetimeauth_poly1305.c \ crypto_onetimeauth/poly1305/onetimeauth_poly1305_api.c \ diff --git a/src/libsodium/crypto_auth/hmacsha512256/ref/api.h b/src/libsodium/crypto_auth/hmacsha512256/cp/api.h similarity index 100% rename from src/libsodium/crypto_auth/hmacsha512256/ref/api.h rename to src/libsodium/crypto_auth/hmacsha512256/cp/api.h diff --git a/src/libsodium/crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c b/src/libsodium/crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c new file mode 100644 index 00000000..27a14943 --- /dev/null +++ b/src/libsodium/crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c @@ -0,0 +1,140 @@ + +/*- + * Copyright 2005,2007,2009 Colin Percival + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include "api.h" +#include "crypto_auth_hmacsha512256.h" +#include "crypto_hash_sha512.h" +#include "utils.h" + +#include + +#include +#include + +int +crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state, + const unsigned char *key, + size_t keylen) +{ + unsigned char pad[128]; + unsigned char khash[64]; + size_t i; + + if (keylen > 128) { + crypto_hash_sha512_init(&state->ictx); + crypto_hash_sha512_update(&state->ictx, key, keylen); + crypto_hash_sha512_final(&state->ictx, khash); + key = khash; + keylen = 64; + } + crypto_hash_sha512_init(&state->ictx); + memset(pad, 0x36, 128); + for (i = 0; i < keylen; i++) { + pad[i] ^= key[i]; + } + crypto_hash_sha512_update(&state->ictx, pad, 128); + + crypto_hash_sha512_init(&state->octx); + memset(pad, 0x5c, 128); + for (i = 0; i < keylen; i++) { + pad[i] ^= key[i]; + } + crypto_hash_sha512_update(&state->octx, pad, 128); + + sodium_memzero((void *) khash, 64); + + return 0; +} + +int +crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state, + const unsigned char *in, + unsigned long long inlen) +{ + crypto_hash_sha512_update(&state->ictx, in, inlen); + + return 0; +} + +int +crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state, + unsigned char *out) +{ + unsigned char ihash[64]; + + crypto_hash_sha512_final(&state->ictx, ihash); + crypto_hash_sha512_update(&state->octx, ihash, 64); + crypto_hash_sha512_final(&state->octx, out); + + sodium_memzero((void *) ihash, 64); + + return 0; +} + +int +crypto_auth_hmacsha512256_init(crypto_auth_hmacsha512256_state *state, + const unsigned char *key, + size_t keylen) +{ + return crypto_auth_hmacsha512_init((crypto_auth_hmacsha512_state *) state, + key, keylen); +} + +int +crypto_auth_hmacsha512256_update(crypto_auth_hmacsha512256_state *state, + const unsigned char *in, + unsigned long long inlen) +{ + return crypto_auth_hmacsha512_update((crypto_auth_hmacsha512_state *) state, + in, inlen); +} + +int +crypto_auth_hmacsha512256_final(crypto_auth_hmacsha512256_state *state, + unsigned char *out) +{ + unsigned char out0[64]; + + crypto_auth_hmacsha512_final((crypto_auth_hmacsha512_state *) state, out0); + memcpy(out, out0, 32); + + return 0; +} + +int +crypto_auth(unsigned char *out, const unsigned char *in, + unsigned long long inlen, const unsigned char *k) +{ + crypto_auth_hmacsha512256_state state; + + crypto_auth_hmacsha512256_init(&state, k, crypto_auth_KEYBYTES); + crypto_auth_hmacsha512256_update(&state, in, inlen); + crypto_auth_hmacsha512256_final(&state, out); + + return 0; +} diff --git a/src/libsodium/crypto_auth/hmacsha512256/ref/verify_hmacsha512256.c b/src/libsodium/crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c similarity index 100% rename from src/libsodium/crypto_auth/hmacsha512256/ref/verify_hmacsha512256.c rename to src/libsodium/crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c diff --git a/src/libsodium/crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c b/src/libsodium/crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c deleted file mode 100644 index d3ebfd96..00000000 --- a/src/libsodium/crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c +++ /dev/null @@ -1,86 +0,0 @@ -/* - * 20080913 - * D. J. Bernstein - * Public domain. - * */ - -#include "api.h" -#include "_crypto_hashblocks_sha512.h" - -#define blocks crypto_hashblocks_sha512 - -typedef unsigned long long uint64; - -static const unsigned char iv[64] = { - 0x6a,0x09,0xe6,0x67,0xf3,0xbc,0xc9,0x08, - 0xbb,0x67,0xae,0x85,0x84,0xca,0xa7,0x3b, - 0x3c,0x6e,0xf3,0x72,0xfe,0x94,0xf8,0x2b, - 0xa5,0x4f,0xf5,0x3a,0x5f,0x1d,0x36,0xf1, - 0x51,0x0e,0x52,0x7f,0xad,0xe6,0x82,0xd1, - 0x9b,0x05,0x68,0x8c,0x2b,0x3e,0x6c,0x1f, - 0x1f,0x83,0xd9,0xab,0xfb,0x41,0xbd,0x6b, - 0x5b,0xe0,0xcd,0x19,0x13,0x7e,0x21,0x79 -} ; - -int crypto_auth(unsigned char *out,const unsigned char *in,unsigned long long inlen,const unsigned char *k) -{ - unsigned char h[64]; - unsigned char padded[256]; - unsigned long long i; - unsigned long long bytes = 128 + inlen; - - for (i = 0;i < 64;++i) h[i] = iv[i]; - - for (i = 0;i < 32;++i) padded[i] = k[i] ^ 0x36; - for (i = 32;i < 128;++i) padded[i] = 0x36; - - blocks(h,padded,128); - blocks(h,in,inlen); - in += inlen; - inlen &= 127; - in -= inlen; - - for (i = 0;i < inlen;++i) padded[i] = in[i]; - padded[inlen] = 0x80; - - if (inlen < 112) { - for (i = inlen + 1;i < 119;++i) padded[i] = 0; - padded[119] = bytes >> 61; - padded[120] = bytes >> 53; - padded[121] = bytes >> 45; - padded[122] = bytes >> 37; - padded[123] = bytes >> 29; - padded[124] = bytes >> 21; - padded[125] = bytes >> 13; - padded[126] = bytes >> 5; - padded[127] = bytes << 3; - blocks(h,padded,128); - } else { - for (i = inlen + 1;i < 247;++i) padded[i] = 0; - padded[247] = bytes >> 61; - padded[248] = bytes >> 53; - padded[249] = bytes >> 45; - padded[250] = bytes >> 37; - padded[251] = bytes >> 29; - padded[252] = bytes >> 21; - padded[253] = bytes >> 13; - padded[254] = bytes >> 5; - padded[255] = bytes << 3; - blocks(h,padded,256); - } - - for (i = 0;i < 32;++i) padded[i] = k[i] ^ 0x5c; - for (i = 32;i < 128;++i) padded[i] = 0x5c; - - for (i = 0;i < 64;++i) padded[128 + i] = h[i]; - for (i = 0;i < 64;++i) h[i] = iv[i]; - - for (i = 64;i < 128;++i) padded[128 + i] = 0; - padded[128 + 64] = 0x80; - padded[128 + 126] = 6; - - blocks(h,padded,256); - for (i = 0;i < 32;++i) out[i] = h[i]; - - return 0; -} diff --git a/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c b/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c index 2c4ab4cf..721bbe92 100644 --- a/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c +++ b/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c @@ -187,8 +187,8 @@ SHA256_Transform(uint32_t *state, const unsigned char block[64]) state[i] += S[i]; } - sodium_memzero((void *) W, 256); - sodium_memzero((void *) S, 32); + sodium_memzero((void *) W, sizeof W); + sodium_memzero((void *) S, sizeof S); sodium_memzero((void *) &t0, sizeof t0); sodium_memzero((void *) &t1, sizeof t1); } diff --git a/src/libsodium/crypto_hash/sha512/ref/api.h b/src/libsodium/crypto_hash/sha512/cp/api.h similarity index 65% rename from src/libsodium/crypto_hash/sha512/ref/api.h rename to src/libsodium/crypto_hash/sha512/cp/api.h index afea983f..5e01170d 100644 --- a/src/libsodium/crypto_hash/sha512/ref/api.h +++ b/src/libsodium/crypto_hash/sha512/cp/api.h @@ -2,6 +2,9 @@ #include "crypto_hash_sha512.h" #define crypto_hash crypto_hash_sha512 +#define crypto_hash_init crypto_hash_sha512_init +#define crypto_hash_update crypto_hash_sha512_update +#define crypto_hash_final crypto_hash_sha512_final #define crypto_hash_BYTES crypto_hash_sha512_BYTES #define crypto_hash_PRIMITIVE "sha512" #define crypto_hash_IMPLEMENTATION crypto_hash_sha512_IMPLEMENTATION diff --git a/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c b/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c new file mode 100644 index 00000000..71870083 --- /dev/null +++ b/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c @@ -0,0 +1,322 @@ + +/*- + * Copyright 2005,2007,2009 Colin Percival + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include "api.h" +#include "crypto_hash_sha512.h" +#include "utils.h" + +#include + +#include +#include +#include +#include + +/* Avoid namespace collisions with BSD . */ +#define be64dec _sha512_be64dec +#define be64enc _sha512_be64enc + +static inline uint64_t +be64dec(const void *pp) +{ + const uint8_t *p = (uint8_t const *)pp; + + return ((uint64_t)(p[7]) + ((uint64_t)(p[6]) << 8) + + ((uint64_t)(p[5]) << 16) + ((uint64_t)(p[4]) << 24) + + ((uint64_t)(p[3]) << 32) + ((uint64_t)(p[2]) << 40) + + ((uint64_t)(p[1]) << 48) + ((uint64_t)(p[0]) << 56)); +} + +static inline void +be64enc(void *pp, uint64_t x) +{ + uint8_t *p = (uint8_t *)pp; + + p[7] = x & 0xff; + p[6] = (x >> 8) & 0xff; + p[5] = (x >> 16) & 0xff; + p[4] = (x >> 24) & 0xff; + p[3] = (x >> 32) & 0xff; + p[2] = (x >> 40) & 0xff; + p[1] = (x >> 48) & 0xff; + p[0] = (x >> 56) & 0xff; +} + +static void +be64enc_vect(unsigned char *dst, const uint64_t *src, size_t len) +{ + size_t i; + + for (i = 0; i < len / 8; i++) { + be64enc(dst + i * 8, src[i]); + } +} + +static void +be64dec_vect(uint64_t *dst, const unsigned char *src, size_t len) +{ + size_t i; + + for (i = 0; i < len / 8; i++) { + dst[i] = be64dec(src + i * 8); + } +} + +#define Ch(x, y, z) ((x & (y ^ z)) ^ z) +#define Maj(x, y, z) ((x & (y | z)) | (y & z)) +#define SHR(x, n) (x >> n) +#define ROTR(x, n) ((x >> n) | (x << (64 - n))) +#define S0(x) (ROTR(x, 28) ^ ROTR(x, 34) ^ ROTR(x, 39)) +#define S1(x) (ROTR(x, 14) ^ ROTR(x, 18) ^ ROTR(x, 41)) +#define s0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x, 7)) +#define s1(x) (ROTR(x, 19) ^ ROTR(x, 61) ^ SHR(x, 6)) + +#define RND(a, b, c, d, e, f, g, h, k) \ + t0 = h + S1(e) + Ch(e, f, g) + k; \ + t1 = S0(a) + Maj(a, b, c); \ + d += t0; \ + h = t0 + t1; + +#define RNDr(S, W, i, k) \ + RND(S[(80 - i) % 8], S[(81 - i) % 8], \ + S[(82 - i) % 8], S[(83 - i) % 8], \ + S[(84 - i) % 8], S[(85 - i) % 8], \ + S[(86 - i) % 8], S[(87 - i) % 8], \ + W[i] + k) + +static void +SHA512_Transform(uint64_t *state, const unsigned char block[128]) +{ + uint64_t W[80]; + uint64_t S[8]; + uint64_t t0, t1; + int i; + + be64dec_vect(W, block, 128); + for (i = 16; i < 80; i++) { + W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16]; + } + + memcpy(S, state, 64); + + RNDr(S, W, 0, 0x428a2f98d728ae22ULL); + RNDr(S, W, 1, 0x7137449123ef65cdULL); + RNDr(S, W, 2, 0xb5c0fbcfec4d3b2fULL); + RNDr(S, W, 3, 0xe9b5dba58189dbbcULL); + RNDr(S, W, 4, 0x3956c25bf348b538ULL); + RNDr(S, W, 5, 0x59f111f1b605d019ULL); + RNDr(S, W, 6, 0x923f82a4af194f9bULL); + RNDr(S, W, 7, 0xab1c5ed5da6d8118ULL); + RNDr(S, W, 8, 0xd807aa98a3030242ULL); + RNDr(S, W, 9, 0x12835b0145706fbeULL); + RNDr(S, W, 10, 0x243185be4ee4b28cULL); + RNDr(S, W, 11, 0x550c7dc3d5ffb4e2ULL); + RNDr(S, W, 12, 0x72be5d74f27b896fULL); + RNDr(S, W, 13, 0x80deb1fe3b1696b1ULL); + RNDr(S, W, 14, 0x9bdc06a725c71235ULL); + RNDr(S, W, 15, 0xc19bf174cf692694ULL); + RNDr(S, W, 16, 0xe49b69c19ef14ad2ULL); + RNDr(S, W, 17, 0xefbe4786384f25e3ULL); + RNDr(S, W, 18, 0x0fc19dc68b8cd5b5ULL); + RNDr(S, W, 19, 0x240ca1cc77ac9c65ULL); + RNDr(S, W, 20, 0x2de92c6f592b0275ULL); + RNDr(S, W, 21, 0x4a7484aa6ea6e483ULL); + RNDr(S, W, 22, 0x5cb0a9dcbd41fbd4ULL); + RNDr(S, W, 23, 0x76f988da831153b5ULL); + RNDr(S, W, 24, 0x983e5152ee66dfabULL); + RNDr(S, W, 25, 0xa831c66d2db43210ULL); + RNDr(S, W, 26, 0xb00327c898fb213fULL); + RNDr(S, W, 27, 0xbf597fc7beef0ee4ULL); + RNDr(S, W, 28, 0xc6e00bf33da88fc2ULL); + RNDr(S, W, 29, 0xd5a79147930aa725ULL); + RNDr(S, W, 30, 0x06ca6351e003826fULL); + RNDr(S, W, 31, 0x142929670a0e6e70ULL); + RNDr(S, W, 32, 0x27b70a8546d22ffcULL); + RNDr(S, W, 33, 0x2e1b21385c26c926ULL); + RNDr(S, W, 34, 0x4d2c6dfc5ac42aedULL); + RNDr(S, W, 35, 0x53380d139d95b3dfULL); + RNDr(S, W, 36, 0x650a73548baf63deULL); + RNDr(S, W, 37, 0x766a0abb3c77b2a8ULL); + RNDr(S, W, 38, 0x81c2c92e47edaee6ULL); + RNDr(S, W, 39, 0x92722c851482353bULL); + RNDr(S, W, 40, 0xa2bfe8a14cf10364ULL); + RNDr(S, W, 41, 0xa81a664bbc423001ULL); + RNDr(S, W, 42, 0xc24b8b70d0f89791ULL); + RNDr(S, W, 43, 0xc76c51a30654be30ULL); + RNDr(S, W, 44, 0xd192e819d6ef5218ULL); + RNDr(S, W, 45, 0xd69906245565a910ULL); + RNDr(S, W, 46, 0xf40e35855771202aULL); + RNDr(S, W, 47, 0x106aa07032bbd1b8ULL); + RNDr(S, W, 48, 0x19a4c116b8d2d0c8ULL); + RNDr(S, W, 49, 0x1e376c085141ab53ULL); + RNDr(S, W, 50, 0x2748774cdf8eeb99ULL); + RNDr(S, W, 51, 0x34b0bcb5e19b48a8ULL); + RNDr(S, W, 52, 0x391c0cb3c5c95a63ULL); + RNDr(S, W, 53, 0x4ed8aa4ae3418acbULL); + RNDr(S, W, 54, 0x5b9cca4f7763e373ULL); + RNDr(S, W, 55, 0x682e6ff3d6b2b8a3ULL); + RNDr(S, W, 56, 0x748f82ee5defb2fcULL); + RNDr(S, W, 57, 0x78a5636f43172f60ULL); + RNDr(S, W, 58, 0x84c87814a1f0ab72ULL); + RNDr(S, W, 59, 0x8cc702081a6439ecULL); + RNDr(S, W, 60, 0x90befffa23631e28ULL); + RNDr(S, W, 61, 0xa4506cebde82bde9ULL); + RNDr(S, W, 62, 0xbef9a3f7b2c67915ULL); + RNDr(S, W, 63, 0xc67178f2e372532bULL); + RNDr(S, W, 64, 0xca273eceea26619cULL); + RNDr(S, W, 65, 0xd186b8c721c0c207ULL); + RNDr(S, W, 66, 0xeada7dd6cde0eb1eULL); + RNDr(S, W, 67, 0xf57d4f7fee6ed178ULL); + RNDr(S, W, 68, 0x06f067aa72176fbaULL); + RNDr(S, W, 69, 0x0a637dc5a2c898a6ULL); + RNDr(S, W, 70, 0x113f9804bef90daeULL); + RNDr(S, W, 71, 0x1b710b35131c471bULL); + RNDr(S, W, 72, 0x28db77f523047d84ULL); + RNDr(S, W, 73, 0x32caab7b40c72493ULL); + RNDr(S, W, 74, 0x3c9ebe0a15c9bebcULL); + RNDr(S, W, 75, 0x431d67c49c100d4cULL); + RNDr(S, W, 76, 0x4cc5d4becb3e42b6ULL); + RNDr(S, W, 77, 0x597f299cfc657e2aULL); + RNDr(S, W, 78, 0x5fcb6fab3ad6faecULL); + RNDr(S, W, 79, 0x6c44198c4a475817ULL); + + for (i = 0; i < 8; i++) { + state[i] += S[i]; + } + + sodium_memzero((void *) W, sizeof W); + sodium_memzero((void *) S, sizeof S); + sodium_memzero((void *) &t0, sizeof t0); + sodium_memzero((void *) &t1, sizeof t1); +} + +static unsigned char PAD[128] = { + 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +static void +SHA512_Pad(crypto_hash_sha512_state *state) +{ + unsigned char len[16]; + uint64_t r, plen; + + be64enc_vect(len, state->count, 16); + + r = (state->count[1] >> 3) & 0x7f; + plen = (r < 112) ? (112 - r) : (240 - r); + crypto_hash_sha512_update(state, PAD, (unsigned long long) plen); + + crypto_hash_sha512_update(state, len, 16); +} + +int +crypto_hash_sha512_init(crypto_hash_sha512_state *state) +{ + state->count[0] = state->count[1] = 0; + + state->state[0] = 0x6a09e667f3bcc908ULL; + state->state[1] = 0xbb67ae8584caa73bULL; + state->state[2] = 0x3c6ef372fe94f82bULL; + state->state[3] = 0xa54ff53a5f1d36f1ULL; + state->state[4] = 0x510e527fade682d1ULL; + state->state[5] = 0x9b05688c2b3e6c1fULL; + state->state[6] = 0x1f83d9abfb41bd6bULL; + state->state[7] = 0x5be0cd19137e2179ULL; + + return 0; +} + +int +crypto_hash_sha512_update(crypto_hash_sha512_state *state, + const unsigned char *in, + unsigned long long inlen) +{ + uint64_t bitlen[2]; + uint64_t r; + const unsigned char *src = in; + + r = (state->count[1] >> 3) & 0x7f; + + bitlen[1] = ((uint64_t)inlen) << 3; + bitlen[0] = ((uint64_t)inlen) >> 61; + + if ((state->count[1] += bitlen[1]) < bitlen[1]) { + state->count[0]++; + } + state->count[0] += bitlen[0]; + + if (inlen < 128 - r) { + memcpy(&state->buf[r], src, inlen); + return 0; + } + memcpy(&state->buf[r], src, 128 - r); + SHA512_Transform(state->state, state->buf); + src += 128 - r; + inlen -= 128 - r; + + while (inlen >= 128) { + SHA512_Transform(state->state, src); + src += 128; + inlen -= 128; + } + memcpy(state->buf, src, inlen); + + return 0; +} + +int +crypto_hash_sha512_final(crypto_hash_sha512_state *state, + unsigned char *out) +{ + SHA512_Pad(state); + be64enc_vect(out, state->state, 64); + sodium_memzero((void *) state, sizeof *state); + + return 0; +} + +int +crypto_hash(unsigned char *out, const unsigned char *in, + unsigned long long inlen) +{ + crypto_hash_sha512_state state; + + crypto_hash_sha512_init(&state); + crypto_hash_sha512_update(&state, in, inlen); + crypto_hash_sha512_final(&state, out); + + return 0; +} + diff --git a/src/libsodium/crypto_hash/sha512/ref/hash_sha512.c b/src/libsodium/crypto_hash/sha512/ref/hash_sha512.c deleted file mode 100644 index fc66045e..00000000 --- a/src/libsodium/crypto_hash/sha512/ref/hash_sha512.c +++ /dev/null @@ -1,71 +0,0 @@ -/* -20080913 -D. J. Bernstein -Public domain. -*/ - -#include "api.h" -#include "_crypto_hashblocks_sha512.h" - -#define blocks crypto_hashblocks_sha512 - -static const unsigned char iv[64] = { - 0x6a,0x09,0xe6,0x67,0xf3,0xbc,0xc9,0x08, - 0xbb,0x67,0xae,0x85,0x84,0xca,0xa7,0x3b, - 0x3c,0x6e,0xf3,0x72,0xfe,0x94,0xf8,0x2b, - 0xa5,0x4f,0xf5,0x3a,0x5f,0x1d,0x36,0xf1, - 0x51,0x0e,0x52,0x7f,0xad,0xe6,0x82,0xd1, - 0x9b,0x05,0x68,0x8c,0x2b,0x3e,0x6c,0x1f, - 0x1f,0x83,0xd9,0xab,0xfb,0x41,0xbd,0x6b, - 0x5b,0xe0,0xcd,0x19,0x13,0x7e,0x21,0x79 -} ; - -typedef unsigned long long uint64; - -int crypto_hash(unsigned char *out,const unsigned char *in,unsigned long long inlen) -{ - unsigned char h[64]; - unsigned char padded[256]; - unsigned long long i; - unsigned long long bytes = inlen; - - for (i = 0;i < 64;++i) h[i] = iv[i]; - - blocks(h,in,inlen); - in += inlen; - inlen &= 127; - in -= inlen; - - for (i = 0;i < inlen;++i) padded[i] = in[i]; - padded[inlen] = 0x80; - - if (inlen < 112) { - for (i = inlen + 1;i < 119;++i) padded[i] = 0; - padded[119] = bytes >> 61; - padded[120] = bytes >> 53; - padded[121] = bytes >> 45; - padded[122] = bytes >> 37; - padded[123] = bytes >> 29; - padded[124] = bytes >> 21; - padded[125] = bytes >> 13; - padded[126] = bytes >> 5; - padded[127] = bytes << 3; - blocks(h,padded,128); - } else { - for (i = inlen + 1;i < 247;++i) padded[i] = 0; - padded[247] = bytes >> 61; - padded[248] = bytes >> 53; - padded[249] = bytes >> 45; - padded[250] = bytes >> 37; - padded[251] = bytes >> 29; - padded[252] = bytes >> 21; - padded[253] = bytes >> 13; - padded[254] = bytes >> 5; - padded[255] = bytes << 3; - blocks(h,padded,256); - } - - for (i = 0;i < 64;++i) out[i] = h[i]; - - return 0; -} diff --git a/src/libsodium/crypto_hashblocks/sha512/checksum b/src/libsodium/crypto_hashblocks/sha512/checksum deleted file mode 100644 index ed5245ec..00000000 --- a/src/libsodium/crypto_hashblocks/sha512/checksum +++ /dev/null @@ -1 +0,0 @@ -f005c91634ae549f0dd4529ddbaf07038cb75a59b818cd1d4eb4e2b4019ab6733556131f320c4a145c735a22594581d454cccb15c18bf198ffcb2da29fe39456 diff --git a/src/libsodium/crypto_hashblocks/sha512/ref/api.h b/src/libsodium/crypto_hashblocks/sha512/ref/api.h deleted file mode 100644 index 5086bd1c..00000000 --- a/src/libsodium/crypto_hashblocks/sha512/ref/api.h +++ /dev/null @@ -1,9 +0,0 @@ - -#include "_crypto_hashblocks_sha512.h" - -#define crypto_hashblocks crypto_hashblocks_sha512 -#define crypto_hashblocks_STATEBYTES crypto_hashblocks_sha512_STATEBYTES -#define crypto_hashblocks_BLOCKBYTES crypto_hashblocks_sha512_BLOCKBYTES -#define crypto_hashblocks_PRIMITIVE "sha512" -#define crypto_hashblocks_IMPLEMENTATION crypto_hashblocks_sha512_IMPLEMENTATION -#define crypto_hashblocks_VERSION crypto_hashblocks_sha512_VERSION diff --git a/src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c b/src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c deleted file mode 100644 index 6571ed64..00000000 --- a/src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c +++ /dev/null @@ -1,239 +0,0 @@ -#include "api.h" - -typedef unsigned long long uint64; - -static uint64 load_bigendian(const unsigned char *x) -{ - return - (uint64) (x[7]) \ - | (((uint64) (x[6])) << 8) \ - | (((uint64) (x[5])) << 16) \ - | (((uint64) (x[4])) << 24) \ - | (((uint64) (x[3])) << 32) \ - | (((uint64) (x[2])) << 40) \ - | (((uint64) (x[1])) << 48) \ - | (((uint64) (x[0])) << 56) - ; -} - -static void store_bigendian(unsigned char *x,uint64 u) -{ - x[7] = u; u >>= 8; - x[6] = u; u >>= 8; - x[5] = u; u >>= 8; - x[4] = u; u >>= 8; - x[3] = u; u >>= 8; - x[2] = u; u >>= 8; - x[1] = u; u >>= 8; - x[0] = u; -} - -#define SHR(x,c) ((x) >> (c)) -#define ROTR(x,c) (((x) >> (c)) | ((x) << (64 - (c)))) - -#define Ch(x,y,z) ((x & y) ^ (~x & z)) -#define Maj(x,y,z) ((x & y) ^ (x & z) ^ (y & z)) -#define Sigma0(x) (ROTR(x,28) ^ ROTR(x,34) ^ ROTR(x,39)) -#define Sigma1(x) (ROTR(x,14) ^ ROTR(x,18) ^ ROTR(x,41)) -#define sigma0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x,7)) -#define sigma1(x) (ROTR(x,19) ^ ROTR(x,61) ^ SHR(x,6)) - -#define M(w0,w14,w9,w1) w0 = sigma1(w14) + w9 + sigma0(w1) + w0; - -#define EXPAND \ - M(w0 ,w14,w9 ,w1 ) \ - M(w1 ,w15,w10,w2 ) \ - M(w2 ,w0 ,w11,w3 ) \ - M(w3 ,w1 ,w12,w4 ) \ - M(w4 ,w2 ,w13,w5 ) \ - M(w5 ,w3 ,w14,w6 ) \ - M(w6 ,w4 ,w15,w7 ) \ - M(w7 ,w5 ,w0 ,w8 ) \ - M(w8 ,w6 ,w1 ,w9 ) \ - M(w9 ,w7 ,w2 ,w10) \ - M(w10,w8 ,w3 ,w11) \ - M(w11,w9 ,w4 ,w12) \ - M(w12,w10,w5 ,w13) \ - M(w13,w11,w6 ,w14) \ - M(w14,w12,w7 ,w15) \ - M(w15,w13,w8 ,w0 ) - -#define F(w,k) \ - T1 = h + Sigma1(e) + Ch(e,f,g) + k + w; \ - T2 = Sigma0(a) + Maj(a,b,c); \ - h = g; \ - g = f; \ - f = e; \ - e = d + T1; \ - d = c; \ - c = b; \ - b = a; \ - a = T1 + T2; - -int crypto_hashblocks(unsigned char *statebytes,const unsigned char *in,unsigned long long inlen) -{ - uint64 state[8]; - uint64 a; - uint64 b; - uint64 c; - uint64 d; - uint64 e; - uint64 f; - uint64 g; - uint64 h; - uint64 T1; - uint64 T2; - - a = load_bigendian(statebytes + 0); state[0] = a; - b = load_bigendian(statebytes + 8); state[1] = b; - c = load_bigendian(statebytes + 16); state[2] = c; - d = load_bigendian(statebytes + 24); state[3] = d; - e = load_bigendian(statebytes + 32); state[4] = e; - f = load_bigendian(statebytes + 40); state[5] = f; - g = load_bigendian(statebytes + 48); state[6] = g; - h = load_bigendian(statebytes + 56); state[7] = h; - - while (inlen >= 128) { - uint64 w0 = load_bigendian(in + 0); - uint64 w1 = load_bigendian(in + 8); - uint64 w2 = load_bigendian(in + 16); - uint64 w3 = load_bigendian(in + 24); - uint64 w4 = load_bigendian(in + 32); - uint64 w5 = load_bigendian(in + 40); - uint64 w6 = load_bigendian(in + 48); - uint64 w7 = load_bigendian(in + 56); - uint64 w8 = load_bigendian(in + 64); - uint64 w9 = load_bigendian(in + 72); - uint64 w10 = load_bigendian(in + 80); - uint64 w11 = load_bigendian(in + 88); - uint64 w12 = load_bigendian(in + 96); - uint64 w13 = load_bigendian(in + 104); - uint64 w14 = load_bigendian(in + 112); - uint64 w15 = load_bigendian(in + 120); - - F(w0 ,0x428a2f98d728ae22ULL) - F(w1 ,0x7137449123ef65cdULL) - F(w2 ,0xb5c0fbcfec4d3b2fULL) - F(w3 ,0xe9b5dba58189dbbcULL) - F(w4 ,0x3956c25bf348b538ULL) - F(w5 ,0x59f111f1b605d019ULL) - F(w6 ,0x923f82a4af194f9bULL) - F(w7 ,0xab1c5ed5da6d8118ULL) - F(w8 ,0xd807aa98a3030242ULL) - F(w9 ,0x12835b0145706fbeULL) - F(w10,0x243185be4ee4b28cULL) - F(w11,0x550c7dc3d5ffb4e2ULL) - F(w12,0x72be5d74f27b896fULL) - F(w13,0x80deb1fe3b1696b1ULL) - F(w14,0x9bdc06a725c71235ULL) - F(w15,0xc19bf174cf692694ULL) - - EXPAND - - F(w0 ,0xe49b69c19ef14ad2ULL) - F(w1 ,0xefbe4786384f25e3ULL) - F(w2 ,0x0fc19dc68b8cd5b5ULL) - F(w3 ,0x240ca1cc77ac9c65ULL) - F(w4 ,0x2de92c6f592b0275ULL) - F(w5 ,0x4a7484aa6ea6e483ULL) - F(w6 ,0x5cb0a9dcbd41fbd4ULL) - F(w7 ,0x76f988da831153b5ULL) - F(w8 ,0x983e5152ee66dfabULL) - F(w9 ,0xa831c66d2db43210ULL) - F(w10,0xb00327c898fb213fULL) - F(w11,0xbf597fc7beef0ee4ULL) - F(w12,0xc6e00bf33da88fc2ULL) - F(w13,0xd5a79147930aa725ULL) - F(w14,0x06ca6351e003826fULL) - F(w15,0x142929670a0e6e70ULL) - - EXPAND - - F(w0 ,0x27b70a8546d22ffcULL) - F(w1 ,0x2e1b21385c26c926ULL) - F(w2 ,0x4d2c6dfc5ac42aedULL) - F(w3 ,0x53380d139d95b3dfULL) - F(w4 ,0x650a73548baf63deULL) - F(w5 ,0x766a0abb3c77b2a8ULL) - F(w6 ,0x81c2c92e47edaee6ULL) - F(w7 ,0x92722c851482353bULL) - F(w8 ,0xa2bfe8a14cf10364ULL) - F(w9 ,0xa81a664bbc423001ULL) - F(w10,0xc24b8b70d0f89791ULL) - F(w11,0xc76c51a30654be30ULL) - F(w12,0xd192e819d6ef5218ULL) - F(w13,0xd69906245565a910ULL) - F(w14,0xf40e35855771202aULL) - F(w15,0x106aa07032bbd1b8ULL) - - EXPAND - - F(w0 ,0x19a4c116b8d2d0c8ULL) - F(w1 ,0x1e376c085141ab53ULL) - F(w2 ,0x2748774cdf8eeb99ULL) - F(w3 ,0x34b0bcb5e19b48a8ULL) - F(w4 ,0x391c0cb3c5c95a63ULL) - F(w5 ,0x4ed8aa4ae3418acbULL) - F(w6 ,0x5b9cca4f7763e373ULL) - F(w7 ,0x682e6ff3d6b2b8a3ULL) - F(w8 ,0x748f82ee5defb2fcULL) - F(w9 ,0x78a5636f43172f60ULL) - F(w10,0x84c87814a1f0ab72ULL) - F(w11,0x8cc702081a6439ecULL) - F(w12,0x90befffa23631e28ULL) - F(w13,0xa4506cebde82bde9ULL) - F(w14,0xbef9a3f7b2c67915ULL) - F(w15,0xc67178f2e372532bULL) - - EXPAND - - F(w0 ,0xca273eceea26619cULL) - F(w1 ,0xd186b8c721c0c207ULL) - F(w2 ,0xeada7dd6cde0eb1eULL) - F(w3 ,0xf57d4f7fee6ed178ULL) - F(w4 ,0x06f067aa72176fbaULL) - F(w5 ,0x0a637dc5a2c898a6ULL) - F(w6 ,0x113f9804bef90daeULL) - F(w7 ,0x1b710b35131c471bULL) - F(w8 ,0x28db77f523047d84ULL) - F(w9 ,0x32caab7b40c72493ULL) - F(w10,0x3c9ebe0a15c9bebcULL) - F(w11,0x431d67c49c100d4cULL) - F(w12,0x4cc5d4becb3e42b6ULL) - F(w13,0x597f299cfc657e2aULL) - F(w14,0x5fcb6fab3ad6faecULL) - F(w15,0x6c44198c4a475817ULL) - - a += state[0]; - b += state[1]; - c += state[2]; - d += state[3]; - e += state[4]; - f += state[5]; - g += state[6]; - h += state[7]; - - state[0] = a; - state[1] = b; - state[2] = c; - state[3] = d; - state[4] = e; - state[5] = f; - state[6] = g; - state[7] = h; - - in += 128; - inlen -= 128; - } - - store_bigendian(statebytes + 0,state[0]); - store_bigendian(statebytes + 8,state[1]); - store_bigendian(statebytes + 16,state[2]); - store_bigendian(statebytes + 24,state[3]); - store_bigendian(statebytes + 32,state[4]); - store_bigendian(statebytes + 40,state[5]); - store_bigendian(statebytes + 48,state[6]); - store_bigendian(statebytes + 56,state[7]); - - return 0; -} diff --git a/src/libsodium/crypto_hashblocks/try.c b/src/libsodium/crypto_hashblocks/try.c deleted file mode 100644 index 3c72cdd2..00000000 --- a/src/libsodium/crypto_hashblocks/try.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * crypto_hashblocks/try.c version 20090118 - * D. J. Bernstein - * Public domain. - */ - -#include -#include "crypto_hashblocks.h" -#include "utils.h" -#include "windows/windows-quirks.h" - -extern unsigned char *alignedcalloc(unsigned long long); - -const char *primitiveimplementation = crypto_hashblocks_IMPLEMENTATION; - -#define MAXTEST_BYTES (10000 + crypto_hashblocks_STATEBYTES) -#define CHECKSUM_BYTES 4096 -#define TUNE_BYTES 1536 - -static unsigned char *h; -static unsigned char *h2; -static unsigned char *m; -static unsigned char *m2; - -void preallocate(void) -{ -} - -void allocate(void) -{ - h = alignedcalloc(crypto_hashblocks_STATEBYTES); - h2 = alignedcalloc(crypto_hashblocks_STATEBYTES); - m = alignedcalloc(MAXTEST_BYTES); - m2 = alignedcalloc(MAXTEST_BYTES); -} - -void predoit(void) -{ -} - -void doit(void) -{ - crypto_hashblocks(h,m,TUNE_BYTES); -} - -char checksum[crypto_hashblocks_STATEBYTES * 2 + 1]; - -const char *checksum_compute(void) -{ - long long i; - long long j; - - for (i = 0;i < CHECKSUM_BYTES;++i) { - long long hlen = crypto_hashblocks_STATEBYTES; - long long mlen = i; - for (j = -16;j < 0;++j) h[j] = rand(); - for (j = hlen;j < hlen + 16;++j) h[j] = rand(); - for (j = -16;j < hlen + 16;++j) h2[j] = h[j]; - for (j = -16;j < 0;++j) m[j] = rand(); - for (j = mlen;j < mlen + 16;++j) m[j] = rand(); - for (j = -16;j < mlen + 16;++j) m2[j] = m[j]; - if (crypto_hashblocks(h,m,mlen) != 0) return "crypto_hashblocks returns nonzero"; - for (j = -16;j < mlen + 16;++j) if (m2[j] != m[j]) return "crypto_hashblocks writes to input"; - for (j = -16;j < 0;++j) if (h2[j] != h[j]) return "crypto_hashblocks writes before output"; - for (j = hlen;j < hlen + 16;++j) if (h2[j] != h[j]) return "crypto_hashblocks writes after output"; - for (j = 0;j < hlen;++j) m2[j] = h2[j]; - if (crypto_hashblocks(h2,m2,mlen) != 0) return "crypto_hashblocks returns nonzero"; - if (crypto_hashblocks(m2,m2,mlen) != 0) return "crypto_hashblocks returns nonzero"; - for (j = 0;j < hlen;++j) if (m2[j] != h2[j]) return "crypto_hashblocks does not handle overlap"; - for (j = 0;j < mlen;++j) m[j] ^= h[j % hlen]; - m[mlen] = h[0]; - } - if (crypto_hashblocks(h,m,CHECKSUM_BYTES) != 0) return "crypto_hashblocks returns nonzero"; - - sodium_bin2hex(checksum, sizeof checksum, h, crypto_hashblocks_STATEBYTES); - - return 0; -} diff --git a/src/libsodium/include/Makefile.am b/src/libsodium/include/Makefile.am index c945ba8b..9f713e97 100644 --- a/src/libsodium/include/Makefile.am +++ b/src/libsodium/include/Makefile.am @@ -52,7 +52,6 @@ SODIUM_EXPORT = \ sodium/utils.h EXTRA_SRC = $(SODIUM_EXPORT) \ - sodium/_crypto_hashblocks_sha512.h \ sodium/version.h.in nobase_include_HEADERS = $(SODIUM_EXPORT) diff --git a/src/libsodium/include/sodium/_crypto_hashblocks_sha512.h b/src/libsodium/include/sodium/_crypto_hashblocks_sha512.h deleted file mode 100644 index 3b51a3c5..00000000 --- a/src/libsodium/include/sodium/_crypto_hashblocks_sha512.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _crypto_hashblocks_sha512_H -#define _crypto_hashblocks_sha512_H - -#include -#include "export.h" - -#define crypto_hashblocks_sha512_STATEBYTES 64U -#define crypto_hashblocks_sha512_BLOCKBYTES 128U - -#ifdef __cplusplus -# if __GNUC__ -# pragma GCC diagnostic ignored "-Wlong-long" -# endif -extern "C" { -#endif - -/* This function is only used internally */ -int crypto_hashblocks_sha512(unsigned char *,const unsigned char *,unsigned long long); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h index 8e3ed29d..1fdd426a 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h @@ -53,7 +53,7 @@ int crypto_auth_hmacsha256_final(crypto_auth_hmacsha256_state *state, } #endif -#define crypto_auth_hmacsha256_ref crypto_auth_hmacsha256 -#define crypto_auth_hmacsha256_ref_verify crypto_auth_hmacsha256_verify +#define crypto_auth_hmacsha256_cp crypto_auth_hmacsha256 +#define crypto_auth_hmacsha256_cp_verify crypto_auth_hmacsha256_verify #endif diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h index 5daeb03a..07413144 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h @@ -2,6 +2,7 @@ #define crypto_auth_hmacsha512256_H #include +#include "crypto_hash_sha512.h" #include "export.h" #define crypto_auth_hmacsha512256_BYTES 32U @@ -14,6 +15,13 @@ extern "C" { #endif +typedef struct crypto_auth_hmacsha512_state { + crypto_hash_sha512_state ictx; + crypto_hash_sha512_state octx; +} crypto_auth_hmacsha512_state; + +typedef struct crypto_auth_hmacsha512_state crypto_auth_hmacsha512256_state; + SODIUM_EXPORT size_t crypto_auth_hmacsha512256_bytes(void); @@ -33,7 +41,7 @@ int crypto_auth_hmacsha512256_verify(const unsigned char *,const unsigned char * } #endif -#define crypto_auth_hmacsha512256_ref crypto_auth_hmacsha512256 -#define crypto_auth_hmacsha512256_ref_verify crypto_auth_hmacsha512256_verify +#define crypto_auth_hmacsha512256_cp crypto_auth_hmacsha512256 +#define crypto_auth_hmacsha512256_cp_verify crypto_auth_hmacsha512256_verify #endif diff --git a/src/libsodium/include/sodium/crypto_hash_sha256.h b/src/libsodium/include/sodium/crypto_hash_sha256.h index 9aed565d..13cdecb8 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha256.h +++ b/src/libsodium/include/sodium/crypto_hash_sha256.h @@ -48,6 +48,6 @@ int crypto_hash_sha256_final(crypto_hash_sha256_state *state, } #endif -#define crypto_hash_sha256_ref crypto_hash_sha256 +#define crypto_hash_sha256_cp crypto_hash_sha256 #endif diff --git a/src/libsodium/include/sodium/crypto_hash_sha512.h b/src/libsodium/include/sodium/crypto_hash_sha512.h index c25d0700..9343f224 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha512.h +++ b/src/libsodium/include/sodium/crypto_hash_sha512.h @@ -2,6 +2,9 @@ #define crypto_hash_sha512_H #include +#include +#include + #include "export.h" #define crypto_hash_sha512_BYTES 64U @@ -14,6 +17,12 @@ extern "C" { #endif +typedef struct crypto_hash_sha512_state { + uint64_t state[8]; + uint64_t count[2]; + unsigned char buf[128]; +} crypto_hash_sha512_state; + SODIUM_EXPORT size_t crypto_hash_sha512_bytes(void); @@ -23,10 +32,22 @@ const char * crypto_hash_sha512_primitive(void); SODIUM_EXPORT int crypto_hash_sha512(unsigned char *,const unsigned char *,unsigned long long); +SODIUM_EXPORT +int crypto_hash_sha512_init(crypto_hash_sha512_state *state); + +SODIUM_EXPORT +int crypto_hash_sha512_update(crypto_hash_sha512_state *state, + const unsigned char *in, + unsigned long long inlen); + +SODIUM_EXPORT +int crypto_hash_sha512_final(crypto_hash_sha512_state *state, + unsigned char *out); + #ifdef __cplusplus } #endif -#define crypto_hash_sha512_ref crypto_hash_sha512 +#define crypto_hash_sha512_cp crypto_hash_sha512 #endif From 3c322ca7b9cbedc3b50078f35fc6ea5e7ea998b4 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 14 Apr 2014 21:14:59 -0700 Subject: [PATCH 42/57] Since auth_hmac_sha512256 is just truncated hmac_sha512, expose hmac_sha512 --- libsodium.vcxproj | 4 + libsodium.vcxproj.filters | 12 ++ src/libsodium/Makefile.am | 4 + .../hmacsha512/auth_hmacsha512_api.c | 16 +++ src/libsodium/crypto_auth/hmacsha512/cp/api.h | 10 ++ .../hmacsha512/cp/hmac_hmacsha512.c | 110 ++++++++++++++++++ .../hmacsha512/cp/verify_hmacsha512.c | 10 ++ .../hmacsha512256/cp/hmac_hmacsha512256.c | 88 +------------- .../hmacsha512256/cp/verify_hmacsha512256.c | 3 +- src/libsodium/include/Makefile.am | 1 + src/libsodium/include/sodium.h | 1 + .../include/sodium/crypto_auth_hmacsha512.h | 59 ++++++++++ .../sodium/crypto_auth_hmacsha512256.h | 21 +++- 13 files changed, 245 insertions(+), 94 deletions(-) create mode 100644 src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512_api.c create mode 100644 src/libsodium/crypto_auth/hmacsha512/cp/api.h create mode 100644 src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha512.c create mode 100644 src/libsodium/crypto_auth/hmacsha512/cp/verify_hmacsha512.c create mode 100644 src/libsodium/include/sodium/crypto_auth_hmacsha512.h diff --git a/libsodium.vcxproj b/libsodium.vcxproj index 4b723ccb..f7815ed3 100644 --- a/libsodium.vcxproj +++ b/libsodium.vcxproj @@ -318,6 +318,7 @@ + @@ -374,6 +375,9 @@ + + + diff --git a/libsodium.vcxproj.filters b/libsodium.vcxproj.filters index e766cc40..2bcd0ddc 100644 --- a/libsodium.vcxproj.filters +++ b/libsodium.vcxproj.filters @@ -24,6 +24,9 @@ Header Files + + Header Files + Header Files @@ -190,6 +193,9 @@ Source Files + + Source Files + Source Files @@ -199,12 +205,18 @@ Source Files + + Source Files + Source Files Source Files + + Source Files + Source Files diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index 13da6ec6..7e75f28d 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -7,6 +7,10 @@ libsodium_la_SOURCES = \ crypto_auth/hmacsha256/cp/api.h \ crypto_auth/hmacsha256/cp/hmac_hmacsha256.c \ crypto_auth/hmacsha256/cp/verify_hmacsha256.c \ + crypto_auth/hmacsha512/auth_hmacsha512_api.c \ + crypto_auth/hmacsha512/cp/api.h \ + crypto_auth/hmacsha512/cp/hmac_hmacsha512.c \ + crypto_auth/hmacsha512/cp/verify_hmacsha512.c \ crypto_auth/hmacsha512256/auth_hmacsha512256_api.c \ crypto_auth/hmacsha512256/cp/api.h \ crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c \ diff --git a/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512_api.c b/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512_api.c new file mode 100644 index 00000000..0fdbf013 --- /dev/null +++ b/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512_api.c @@ -0,0 +1,16 @@ +#include "crypto_auth_hmacsha512.h" + +size_t +crypto_auth_hmacsha512_bytes(void) { + return crypto_auth_hmacsha512_BYTES; +} + +size_t +crypto_auth_hmacsha512_keybytes(void) { + return crypto_auth_hmacsha512_KEYBYTES; +} + +const char * +crypto_auth_hmacsha512_primitive(void) { + return "hmacsha512"; +} diff --git a/src/libsodium/crypto_auth/hmacsha512/cp/api.h b/src/libsodium/crypto_auth/hmacsha512/cp/api.h new file mode 100644 index 00000000..e8402aa3 --- /dev/null +++ b/src/libsodium/crypto_auth/hmacsha512/cp/api.h @@ -0,0 +1,10 @@ + +#include "crypto_auth_hmacsha512.h" + +#define crypto_auth crypto_auth_hmacsha512 +#define crypto_auth_verify crypto_auth_hmacsha512_verify +#define crypto_auth_BYTES crypto_auth_hmacsha512_BYTES +#define crypto_auth_KEYBYTES crypto_auth_hmacsha512_KEYBYTES +#define crypto_auth_PRIMITIVE "hmacsha512" +#define crypto_auth_IMPLEMENTATION crypto_auth_hmacsha512_IMPLEMENTATION +#define crypto_auth_VERSION crypto_auth_hmacsha512_VERSION diff --git a/src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha512.c b/src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha512.c new file mode 100644 index 00000000..8d841543 --- /dev/null +++ b/src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha512.c @@ -0,0 +1,110 @@ + +/*- + * Copyright 2005,2007,2009 Colin Percival + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include "api.h" +#include "crypto_auth_hmacsha512.h" +#include "crypto_hash_sha512.h" +#include "utils.h" + +#include + +#include +#include + +int +crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state, + const unsigned char *key, + size_t keylen) +{ + unsigned char pad[128]; + unsigned char khash[64]; + size_t i; + + if (keylen > 128) { + crypto_hash_sha512_init(&state->ictx); + crypto_hash_sha512_update(&state->ictx, key, keylen); + crypto_hash_sha512_final(&state->ictx, khash); + key = khash; + keylen = 64; + } + crypto_hash_sha512_init(&state->ictx); + memset(pad, 0x36, 128); + for (i = 0; i < keylen; i++) { + pad[i] ^= key[i]; + } + crypto_hash_sha512_update(&state->ictx, pad, 128); + + crypto_hash_sha512_init(&state->octx); + memset(pad, 0x5c, 128); + for (i = 0; i < keylen; i++) { + pad[i] ^= key[i]; + } + crypto_hash_sha512_update(&state->octx, pad, 128); + + sodium_memzero((void *) khash, 64); + + return 0; +} + +int +crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state, + const unsigned char *in, + unsigned long long inlen) +{ + crypto_hash_sha512_update(&state->ictx, in, inlen); + + return 0; +} + +int +crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state, + unsigned char *out) +{ + unsigned char ihash[64]; + + crypto_hash_sha512_final(&state->ictx, ihash); + crypto_hash_sha512_update(&state->octx, ihash, 64); + crypto_hash_sha512_final(&state->octx, out); + + sodium_memzero((void *) ihash, 64); + + return 0; +} + +int +crypto_auth(unsigned char *out, const unsigned char *in, + unsigned long long inlen, const unsigned char *k) +{ + crypto_auth_hmacsha512_state state; + + crypto_auth_hmacsha512_init(&state, k, crypto_auth_KEYBYTES); + crypto_auth_hmacsha512_update(&state, in, inlen); + crypto_auth_hmacsha512_final(&state, out); + + return 0; +} diff --git a/src/libsodium/crypto_auth/hmacsha512/cp/verify_hmacsha512.c b/src/libsodium/crypto_auth/hmacsha512/cp/verify_hmacsha512.c new file mode 100644 index 00000000..fccdc1a4 --- /dev/null +++ b/src/libsodium/crypto_auth/hmacsha512/cp/verify_hmacsha512.c @@ -0,0 +1,10 @@ +#include "api.h" +#include "crypto_verify_64.h" + +int crypto_auth_verify(const unsigned char *h, const unsigned char *in, + unsigned long long inlen, const unsigned char *k) +{ + unsigned char correct[64]; + crypto_auth(correct,in,inlen,k); + return crypto_verify_64(h,correct); +} diff --git a/src/libsodium/crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c b/src/libsodium/crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c index 27a14943..4b476c33 100644 --- a/src/libsodium/crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c +++ b/src/libsodium/crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c @@ -1,33 +1,7 @@ -/*- - * Copyright 2005,2007,2009 Colin Percival - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - #include "api.h" #include "crypto_auth_hmacsha512256.h" +#include "crypto_auth_hmacsha512.h" #include "crypto_hash_sha512.h" #include "utils.h" @@ -36,66 +10,6 @@ #include #include -int -crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state, - const unsigned char *key, - size_t keylen) -{ - unsigned char pad[128]; - unsigned char khash[64]; - size_t i; - - if (keylen > 128) { - crypto_hash_sha512_init(&state->ictx); - crypto_hash_sha512_update(&state->ictx, key, keylen); - crypto_hash_sha512_final(&state->ictx, khash); - key = khash; - keylen = 64; - } - crypto_hash_sha512_init(&state->ictx); - memset(pad, 0x36, 128); - for (i = 0; i < keylen; i++) { - pad[i] ^= key[i]; - } - crypto_hash_sha512_update(&state->ictx, pad, 128); - - crypto_hash_sha512_init(&state->octx); - memset(pad, 0x5c, 128); - for (i = 0; i < keylen; i++) { - pad[i] ^= key[i]; - } - crypto_hash_sha512_update(&state->octx, pad, 128); - - sodium_memzero((void *) khash, 64); - - return 0; -} - -int -crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state, - const unsigned char *in, - unsigned long long inlen) -{ - crypto_hash_sha512_update(&state->ictx, in, inlen); - - return 0; -} - -int -crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state, - unsigned char *out) -{ - unsigned char ihash[64]; - - crypto_hash_sha512_final(&state->ictx, ihash); - crypto_hash_sha512_update(&state->octx, ihash, 64); - crypto_hash_sha512_final(&state->octx, out); - - sodium_memzero((void *) ihash, 64); - - return 0; -} - int crypto_auth_hmacsha512256_init(crypto_auth_hmacsha512256_state *state, const unsigned char *key, diff --git a/src/libsodium/crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c b/src/libsodium/crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c index b6cf4893..1e6e18db 100644 --- a/src/libsodium/crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c +++ b/src/libsodium/crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c @@ -1,7 +1,8 @@ #include "api.h" #include "crypto_verify_32.h" -int crypto_auth_verify(const unsigned char *h,const unsigned char *in,unsigned long long inlen,const unsigned char *k) +int crypto_auth_verify(const unsigned char *h, const unsigned char *in, + unsigned long long inlen, const unsigned char *k) { unsigned char correct[32]; crypto_auth(correct,in,inlen,k); diff --git a/src/libsodium/include/Makefile.am b/src/libsodium/include/Makefile.am index 9f713e97..260472be 100644 --- a/src/libsodium/include/Makefile.am +++ b/src/libsodium/include/Makefile.am @@ -4,6 +4,7 @@ SODIUM_EXPORT = \ sodium/core.h \ sodium/crypto_auth.h \ sodium/crypto_auth_hmacsha256.h \ + sodium/crypto_auth_hmacsha512.h \ sodium/crypto_auth_hmacsha512256.h \ sodium/crypto_box.h \ sodium/crypto_box_curve25519xsalsa20poly1305.h \ diff --git a/src/libsodium/include/sodium.h b/src/libsodium/include/sodium.h index 818909c6..4b2022e4 100644 --- a/src/libsodium/include/sodium.h +++ b/src/libsodium/include/sodium.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha512.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512.h new file mode 100644 index 00000000..34764ff2 --- /dev/null +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha512.h @@ -0,0 +1,59 @@ +#ifndef crypto_auth_hmacsha512_H +#define crypto_auth_hmacsha512_H + +#include +#include "crypto_hash_sha512.h" +#include "export.h" + +#define crypto_auth_hmacsha512_BYTES 64U +#define crypto_auth_hmacsha512_KEYBYTES 32U + +#ifdef __cplusplus +# if __GNUC__ +# pragma GCC diagnostic ignored "-Wlong-long" +# endif +extern "C" { +#endif + +typedef struct crypto_auth_hmacsha512_state { + crypto_hash_sha512_state ictx; + crypto_hash_sha512_state octx; +} crypto_auth_hmacsha512_state; + +SODIUM_EXPORT +size_t crypto_auth_hmacsha512_bytes(void); + +SODIUM_EXPORT +size_t crypto_auth_hmacsha512_keybytes(void); + +SODIUM_EXPORT +const char * crypto_auth_hmacsha512_primitive(void); + +SODIUM_EXPORT +int crypto_auth_hmacsha512(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); + +SODIUM_EXPORT +int crypto_auth_hmacsha512_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); + +SODIUM_EXPORT +int crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state, + const unsigned char *key, + size_t keylen); + +SODIUM_EXPORT +int crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state, + const unsigned char *in, + unsigned long long inlen); + +SODIUM_EXPORT +int crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state, + unsigned char *out); + +#ifdef __cplusplus +} +#endif + +#define crypto_auth_hmacsha512_cp crypto_auth_hmacsha512 +#define crypto_auth_hmacsha512_cp_verify crypto_auth_hmacsha512_verify + +#endif diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h index 07413144..07cbe532 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h @@ -2,7 +2,7 @@ #define crypto_auth_hmacsha512256_H #include -#include "crypto_hash_sha512.h" +#include "crypto_auth_hmacsha512.h" #include "export.h" #define crypto_auth_hmacsha512256_BYTES 32U @@ -15,11 +15,6 @@ extern "C" { #endif -typedef struct crypto_auth_hmacsha512_state { - crypto_hash_sha512_state ictx; - crypto_hash_sha512_state octx; -} crypto_auth_hmacsha512_state; - typedef struct crypto_auth_hmacsha512_state crypto_auth_hmacsha512256_state; SODIUM_EXPORT @@ -37,6 +32,20 @@ int crypto_auth_hmacsha512256(unsigned char *,const unsigned char *,unsigned lon SODIUM_EXPORT int crypto_auth_hmacsha512256_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *); +SODIUM_EXPORT +int crypto_auth_hmacsha512256_init(crypto_auth_hmacsha512256_state *state, + const unsigned char *key, + size_t keylen); + +SODIUM_EXPORT +int crypto_auth_hmacsha512256_update(crypto_auth_hmacsha512256_state *state, + const unsigned char *in, + unsigned long long inlen); + +SODIUM_EXPORT +int crypto_auth_hmacsha512256_final(crypto_auth_hmacsha512256_state *state, + unsigned char *out); + #ifdef __cplusplus } #endif From e43a669b6e6cdefcc02b7dcbd551a4180e9096ee Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 14 Apr 2014 21:18:41 -0700 Subject: [PATCH 43/57] Remove useless #define --- src/libsodium/include/sodium/crypto_auth_hmacsha256.h | 3 --- src/libsodium/include/sodium/crypto_auth_hmacsha512.h | 3 --- src/libsodium/include/sodium/crypto_auth_hmacsha512256.h | 3 --- 3 files changed, 9 deletions(-) diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h index 1fdd426a..2242237c 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h @@ -53,7 +53,4 @@ int crypto_auth_hmacsha256_final(crypto_auth_hmacsha256_state *state, } #endif -#define crypto_auth_hmacsha256_cp crypto_auth_hmacsha256 -#define crypto_auth_hmacsha256_cp_verify crypto_auth_hmacsha256_verify - #endif diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha512.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512.h index 34764ff2..d1320a03 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha512.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha512.h @@ -53,7 +53,4 @@ int crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state, } #endif -#define crypto_auth_hmacsha512_cp crypto_auth_hmacsha512 -#define crypto_auth_hmacsha512_cp_verify crypto_auth_hmacsha512_verify - #endif diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h index 07cbe532..15b188b7 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h @@ -50,7 +50,4 @@ int crypto_auth_hmacsha512256_final(crypto_auth_hmacsha512256_state *state, } #endif -#define crypto_auth_hmacsha512256_cp crypto_auth_hmacsha512256 -#define crypto_auth_hmacsha512256_cp_verify crypto_auth_hmacsha512256_verify - #endif From 5e9c894d137e1d13ba77e1d2fffaac20e3d4b035 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 14 Apr 2014 21:32:01 -0700 Subject: [PATCH 44/57] Add tests for auth_hmac_sha512 --- test/default/Makefile.am | 12 ++++++++++++ test/default/auth6.c | 21 +++++++++++++++++++++ test/default/auth6.exp | 8 ++++++++ test/default/auth7.c | 37 +++++++++++++++++++++++++++++++++++++ test/default/auth7.exp | 0 5 files changed, 78 insertions(+) create mode 100644 test/default/auth6.c create mode 100644 test/default/auth6.exp create mode 100644 test/default/auth7.c create mode 100644 test/default/auth7.exp diff --git a/test/default/Makefile.am b/test/default/Makefile.am index 36b04329..c2477509 100644 --- a/test/default/Makefile.am +++ b/test/default/Makefile.am @@ -6,6 +6,8 @@ EXTRA_DIST = \ auth2.exp \ auth3.exp \ auth5.exp \ + auth6.exp \ + auth7.exp \ box.exp \ box2.exp \ box7.exp \ @@ -56,6 +58,8 @@ DISTCLEANFILES = \ auth2.res \ auth3.res \ auth5.res \ + auth6.res \ + auth7.res \ box.res \ box2.res \ box7.res \ @@ -114,6 +118,8 @@ TESTS_TARGETS = \ auth2 \ auth3 \ auth5 \ + auth6 \ + auth7 \ box \ box2 \ box7 \ @@ -178,6 +184,12 @@ auth3_LDADD = $(TESTS_LDADD) auth5_SOURCE = cmptest.h auth5.c windows/windows-quirks.h auth5_LDADD = $(TESTS_LDADD) +auth6_SOURCE = cmptest.h auth6.c windows/windows-quirks.h +auth6_LDADD = $(TESTS_LDADD) + +auth7_SOURCE = cmptest.h auth7.c windows/windows-quirks.h +auth7_LDADD = $(TESTS_LDADD) + box_SOURCE = cmptest.h box.c box_LDADD = $(TESTS_LDADD) diff --git a/test/default/auth6.c b/test/default/auth6.c new file mode 100644 index 00000000..5bf0500f --- /dev/null +++ b/test/default/auth6.c @@ -0,0 +1,21 @@ +#include + +#define TEST_NAME "auth6" +#include "cmptest.h" + +/* "Test Case 2" from RFC 4231 */ +unsigned char key[32] = "Jefe"; +unsigned char c[] = "what do ya want for nothing?"; + +unsigned char a[64]; + +int main(void) +{ + int i; + crypto_auth_hmacsha512(a,c,sizeof c - 1U,key); + for (i = 0;i < 64;++i) { + printf(",0x%02x",(unsigned int) a[i]); + if (i % 8 == 7) printf("\n"); + } + return 0; +} diff --git a/test/default/auth6.exp b/test/default/auth6.exp new file mode 100644 index 00000000..da0c5284 --- /dev/null +++ b/test/default/auth6.exp @@ -0,0 +1,8 @@ +,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 +,0x97,0x58,0xbf,0x75,0xc0,0x5a,0x99,0x4a +,0x6d,0x03,0x4f,0x65,0xf8,0xf0,0xe6,0xfd +,0xca,0xea,0xb1,0xa3,0x4d,0x4a,0x6b,0x4b +,0x63,0x6e,0x07,0x0a,0x38,0xbc,0xe7,0x37 diff --git a/test/default/auth7.c b/test/default/auth7.c new file mode 100644 index 00000000..be67312b --- /dev/null +++ b/test/default/auth7.c @@ -0,0 +1,37 @@ +#include +#include +#include "windows/windows-quirks.h" + +#define TEST_NAME "auth7" +#include "cmptest.h" + +unsigned char key[32]; +unsigned char c[10000]; +unsigned char a[64]; + +int main(void) +{ + int clen; + for (clen = 0;clen < 10000;++clen) { + randombytes(key,sizeof key); + randombytes(c,clen); + crypto_auth_hmacsha512(a,c,clen,key); + if (crypto_auth_hmacsha512_verify(a,c,clen,key) != 0) { + printf("fail %d\n",clen); + return 100; + } + if (clen > 0) { + c[rand() % clen] += 1 + (rand() % 255); + if (crypto_auth_hmacsha512_verify(a,c,clen,key) == 0) { + printf("forgery %d\n",clen); + return 100; + } + a[rand() % sizeof a] += 1 + (rand() % 255); + if (crypto_auth_hmacsha512_verify(a,c,clen,key) == 0) { + printf("forgery %d\n",clen); + return 100; + } + } + } + return 0; +} diff --git a/test/default/auth7.exp b/test/default/auth7.exp new file mode 100644 index 00000000..e69de29b From b4549d8bde44db3d8d8d0ef1c4ec10c83daa6214 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 14 Apr 2014 21:35:29 -0700 Subject: [PATCH 45/57] Update .gitignore for the new tests --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 3b1c0f66..9e8f0594 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,8 @@ test/default/auth test/default/auth2 test/default/auth3 test/default/auth5 +test/default/auth6 +test/default/auth7 test/default/box test/default/box2 test/default/box7 From 03cd2318eb362e7cabe83eb1ee78b48b91be8375 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 14 Apr 2014 21:37:42 -0700 Subject: [PATCH 46/57] hardcoded size -> sizeof --- src/libsodium/crypto_auth/hmacsha256/cp/hmac_hmacsha256.c | 4 ++-- src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha512.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsodium/crypto_auth/hmacsha256/cp/hmac_hmacsha256.c b/src/libsodium/crypto_auth/hmacsha256/cp/hmac_hmacsha256.c index 89de8812..9cd69ac3 100644 --- a/src/libsodium/crypto_auth/hmacsha256/cp/hmac_hmacsha256.c +++ b/src/libsodium/crypto_auth/hmacsha256/cp/hmac_hmacsha256.c @@ -66,7 +66,7 @@ crypto_auth_hmacsha256_init(crypto_auth_hmacsha256_state *state, } crypto_hash_sha256_update(&state->octx, pad, 64); - sodium_memzero((void *) khash, 32); + sodium_memzero((void *) khash, sizeof khash); return 0; } @@ -91,7 +91,7 @@ crypto_auth_hmacsha256_final(crypto_auth_hmacsha256_state *state, crypto_hash_sha256_update(&state->octx, ihash, 32); crypto_hash_sha256_final(&state->octx, out); - sodium_memzero((void *) ihash, 32); + sodium_memzero((void *) ihash, sizeof ihash); return 0; } diff --git a/src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha512.c b/src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha512.c index 8d841543..4ffd2645 100644 --- a/src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha512.c +++ b/src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha512.c @@ -66,7 +66,7 @@ crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state, } crypto_hash_sha512_update(&state->octx, pad, 128); - sodium_memzero((void *) khash, 64); + sodium_memzero((void *) khash, sizeof khash); return 0; } @@ -91,7 +91,7 @@ crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state, crypto_hash_sha512_update(&state->octx, ihash, 64); crypto_hash_sha512_final(&state->octx, out); - sodium_memzero((void *) ihash, 64); + sodium_memzero((void *) ihash, sizeof ihash); return 0; } From 87d5b01ef6a0e5d37cdd0ec022ef72f64fd7f735 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 14 Apr 2014 21:38:41 -0700 Subject: [PATCH 47/57] Indentation --- .../include/sodium/crypto_auth_hmacsha512256.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h index 15b188b7..d7a129b8 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h @@ -34,17 +34,17 @@ int crypto_auth_hmacsha512256_verify(const unsigned char *,const unsigned char * SODIUM_EXPORT int crypto_auth_hmacsha512256_init(crypto_auth_hmacsha512256_state *state, - const unsigned char *key, - size_t keylen); + const unsigned char *key, + size_t keylen); SODIUM_EXPORT int crypto_auth_hmacsha512256_update(crypto_auth_hmacsha512256_state *state, - const unsigned char *in, - unsigned long long inlen); + const unsigned char *in, + unsigned long long inlen); SODIUM_EXPORT int crypto_auth_hmacsha512256_final(crypto_auth_hmacsha512256_state *state, - unsigned char *out); + unsigned char *out); #ifdef __cplusplus } From 8ba704b3f8cee12e8eb3b85f4716c665370f9f98 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 14 Apr 2014 21:59:24 -0700 Subject: [PATCH 48/57] Directly use OpenBSD's arc4random() instead of opening /dev/urandom. --- .../sysrandom/randombytes_sysrandom.c | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c b/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c index d0e25209..3bb521b9 100644 --- a/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c +++ b/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c @@ -24,6 +24,39 @@ # include #endif +#ifdef __OpenBSD__ + +uint32_t +randombytes_sysrandom(void) +{ + return arc4random(); +} + +void +randombytes_sysrandom_stir(void) +{ +} + +uint32_t +randombytes_sysrandom_uniform(const uint32_t upper_bound) +{ + return arc4random_uniform(upper_bound); +} + +void +randombytes_sysrandom_buf(void * const buf, const size_t size) +{ + return arc4random_buf(buf, size); +} + +int +randombytes_sysrandom_close(void) +{ + return 0; +} + +#else /* __OpenBSD__ */ + typedef struct SysRandom_ { #ifdef _WIN32 HCRYPTPROV hcrypt_prov; @@ -202,6 +235,8 @@ randombytes_sysrandom_uniform(const uint32_t upper_bound) return r % upper_bound; } +#endif + const char * randombytes_sysrandom_implementation_name(void) { From 44da824038bf29e75f1288a39e316f1c68d9af0f Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 14 Apr 2014 22:33:46 -0700 Subject: [PATCH 49/57] Indent --- .../crypto_hash/sha512/cp/hash_sha512.c | 313 +++++++++--------- 1 file changed, 156 insertions(+), 157 deletions(-) diff --git a/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c b/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c index 71870083..a7407709 100644 --- a/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c +++ b/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c @@ -70,20 +70,20 @@ be64enc(void *pp, uint64_t x) static void be64enc_vect(unsigned char *dst, const uint64_t *src, size_t len) { - size_t i; + size_t i; - for (i = 0; i < len / 8; i++) { - be64enc(dst + i * 8, src[i]); + for (i = 0; i < len / 8; i++) { + be64enc(dst + i * 8, src[i]); } } static void be64dec_vect(uint64_t *dst, const unsigned char *src, size_t len) { - size_t i; + size_t i; - for (i = 0; i < len / 8; i++) { - dst[i] = be64dec(src + i * 8); + for (i = 0; i < len / 8; i++) { + dst[i] = be64dec(src + i * 8); } } @@ -96,117 +96,117 @@ be64dec_vect(uint64_t *dst, const unsigned char *src, size_t len) #define s0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x, 7)) #define s1(x) (ROTR(x, 19) ^ ROTR(x, 61) ^ SHR(x, 6)) -#define RND(a, b, c, d, e, f, g, h, k) \ - t0 = h + S1(e) + Ch(e, f, g) + k; \ - t1 = S0(a) + Maj(a, b, c); \ - d += t0; \ - h = t0 + t1; +#define RND(a, b, c, d, e, f, g, h, k) \ + t0 = h + S1(e) + Ch(e, f, g) + k; \ + t1 = S0(a) + Maj(a, b, c); \ + d += t0; \ + h = t0 + t1; -#define RNDr(S, W, i, k) \ - RND(S[(80 - i) % 8], S[(81 - i) % 8], \ - S[(82 - i) % 8], S[(83 - i) % 8], \ - S[(84 - i) % 8], S[(85 - i) % 8], \ - S[(86 - i) % 8], S[(87 - i) % 8], \ - W[i] + k) +#define RNDr(S, W, i, k) \ + RND(S[(80 - i) % 8], S[(81 - i) % 8], \ + S[(82 - i) % 8], S[(83 - i) % 8], \ + S[(84 - i) % 8], S[(85 - i) % 8], \ + S[(86 - i) % 8], S[(87 - i) % 8], \ + W[i] + k) static void SHA512_Transform(uint64_t *state, const unsigned char block[128]) { - uint64_t W[80]; - uint64_t S[8]; - uint64_t t0, t1; - int i; + uint64_t W[80]; + uint64_t S[8]; + uint64_t t0, t1; + int i; - be64dec_vect(W, block, 128); - for (i = 16; i < 80; i++) { - W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16]; + be64dec_vect(W, block, 128); + for (i = 16; i < 80; i++) { + W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16]; } - memcpy(S, state, 64); + memcpy(S, state, 64); - RNDr(S, W, 0, 0x428a2f98d728ae22ULL); - RNDr(S, W, 1, 0x7137449123ef65cdULL); - RNDr(S, W, 2, 0xb5c0fbcfec4d3b2fULL); - RNDr(S, W, 3, 0xe9b5dba58189dbbcULL); - RNDr(S, W, 4, 0x3956c25bf348b538ULL); - RNDr(S, W, 5, 0x59f111f1b605d019ULL); - RNDr(S, W, 6, 0x923f82a4af194f9bULL); - RNDr(S, W, 7, 0xab1c5ed5da6d8118ULL); - RNDr(S, W, 8, 0xd807aa98a3030242ULL); - RNDr(S, W, 9, 0x12835b0145706fbeULL); - RNDr(S, W, 10, 0x243185be4ee4b28cULL); - RNDr(S, W, 11, 0x550c7dc3d5ffb4e2ULL); - RNDr(S, W, 12, 0x72be5d74f27b896fULL); - RNDr(S, W, 13, 0x80deb1fe3b1696b1ULL); - RNDr(S, W, 14, 0x9bdc06a725c71235ULL); - RNDr(S, W, 15, 0xc19bf174cf692694ULL); - RNDr(S, W, 16, 0xe49b69c19ef14ad2ULL); - RNDr(S, W, 17, 0xefbe4786384f25e3ULL); - RNDr(S, W, 18, 0x0fc19dc68b8cd5b5ULL); - RNDr(S, W, 19, 0x240ca1cc77ac9c65ULL); - RNDr(S, W, 20, 0x2de92c6f592b0275ULL); - RNDr(S, W, 21, 0x4a7484aa6ea6e483ULL); - RNDr(S, W, 22, 0x5cb0a9dcbd41fbd4ULL); - RNDr(S, W, 23, 0x76f988da831153b5ULL); - RNDr(S, W, 24, 0x983e5152ee66dfabULL); - RNDr(S, W, 25, 0xa831c66d2db43210ULL); - RNDr(S, W, 26, 0xb00327c898fb213fULL); - RNDr(S, W, 27, 0xbf597fc7beef0ee4ULL); - RNDr(S, W, 28, 0xc6e00bf33da88fc2ULL); - RNDr(S, W, 29, 0xd5a79147930aa725ULL); - RNDr(S, W, 30, 0x06ca6351e003826fULL); - RNDr(S, W, 31, 0x142929670a0e6e70ULL); - RNDr(S, W, 32, 0x27b70a8546d22ffcULL); - RNDr(S, W, 33, 0x2e1b21385c26c926ULL); - RNDr(S, W, 34, 0x4d2c6dfc5ac42aedULL); - RNDr(S, W, 35, 0x53380d139d95b3dfULL); - RNDr(S, W, 36, 0x650a73548baf63deULL); - RNDr(S, W, 37, 0x766a0abb3c77b2a8ULL); - RNDr(S, W, 38, 0x81c2c92e47edaee6ULL); - RNDr(S, W, 39, 0x92722c851482353bULL); - RNDr(S, W, 40, 0xa2bfe8a14cf10364ULL); - RNDr(S, W, 41, 0xa81a664bbc423001ULL); - RNDr(S, W, 42, 0xc24b8b70d0f89791ULL); - RNDr(S, W, 43, 0xc76c51a30654be30ULL); - RNDr(S, W, 44, 0xd192e819d6ef5218ULL); - RNDr(S, W, 45, 0xd69906245565a910ULL); - RNDr(S, W, 46, 0xf40e35855771202aULL); - RNDr(S, W, 47, 0x106aa07032bbd1b8ULL); - RNDr(S, W, 48, 0x19a4c116b8d2d0c8ULL); - RNDr(S, W, 49, 0x1e376c085141ab53ULL); - RNDr(S, W, 50, 0x2748774cdf8eeb99ULL); - RNDr(S, W, 51, 0x34b0bcb5e19b48a8ULL); - RNDr(S, W, 52, 0x391c0cb3c5c95a63ULL); - RNDr(S, W, 53, 0x4ed8aa4ae3418acbULL); - RNDr(S, W, 54, 0x5b9cca4f7763e373ULL); - RNDr(S, W, 55, 0x682e6ff3d6b2b8a3ULL); - RNDr(S, W, 56, 0x748f82ee5defb2fcULL); - RNDr(S, W, 57, 0x78a5636f43172f60ULL); - RNDr(S, W, 58, 0x84c87814a1f0ab72ULL); - RNDr(S, W, 59, 0x8cc702081a6439ecULL); - RNDr(S, W, 60, 0x90befffa23631e28ULL); - RNDr(S, W, 61, 0xa4506cebde82bde9ULL); - RNDr(S, W, 62, 0xbef9a3f7b2c67915ULL); - RNDr(S, W, 63, 0xc67178f2e372532bULL); - RNDr(S, W, 64, 0xca273eceea26619cULL); - RNDr(S, W, 65, 0xd186b8c721c0c207ULL); - RNDr(S, W, 66, 0xeada7dd6cde0eb1eULL); - RNDr(S, W, 67, 0xf57d4f7fee6ed178ULL); - RNDr(S, W, 68, 0x06f067aa72176fbaULL); - RNDr(S, W, 69, 0x0a637dc5a2c898a6ULL); - RNDr(S, W, 70, 0x113f9804bef90daeULL); - RNDr(S, W, 71, 0x1b710b35131c471bULL); - RNDr(S, W, 72, 0x28db77f523047d84ULL); - RNDr(S, W, 73, 0x32caab7b40c72493ULL); - RNDr(S, W, 74, 0x3c9ebe0a15c9bebcULL); - RNDr(S, W, 75, 0x431d67c49c100d4cULL); - RNDr(S, W, 76, 0x4cc5d4becb3e42b6ULL); - RNDr(S, W, 77, 0x597f299cfc657e2aULL); - RNDr(S, W, 78, 0x5fcb6fab3ad6faecULL); - RNDr(S, W, 79, 0x6c44198c4a475817ULL); + RNDr(S, W, 0, 0x428a2f98d728ae22ULL); + RNDr(S, W, 1, 0x7137449123ef65cdULL); + RNDr(S, W, 2, 0xb5c0fbcfec4d3b2fULL); + RNDr(S, W, 3, 0xe9b5dba58189dbbcULL); + RNDr(S, W, 4, 0x3956c25bf348b538ULL); + RNDr(S, W, 5, 0x59f111f1b605d019ULL); + RNDr(S, W, 6, 0x923f82a4af194f9bULL); + RNDr(S, W, 7, 0xab1c5ed5da6d8118ULL); + RNDr(S, W, 8, 0xd807aa98a3030242ULL); + RNDr(S, W, 9, 0x12835b0145706fbeULL); + RNDr(S, W, 10, 0x243185be4ee4b28cULL); + RNDr(S, W, 11, 0x550c7dc3d5ffb4e2ULL); + RNDr(S, W, 12, 0x72be5d74f27b896fULL); + RNDr(S, W, 13, 0x80deb1fe3b1696b1ULL); + RNDr(S, W, 14, 0x9bdc06a725c71235ULL); + RNDr(S, W, 15, 0xc19bf174cf692694ULL); + RNDr(S, W, 16, 0xe49b69c19ef14ad2ULL); + RNDr(S, W, 17, 0xefbe4786384f25e3ULL); + RNDr(S, W, 18, 0x0fc19dc68b8cd5b5ULL); + RNDr(S, W, 19, 0x240ca1cc77ac9c65ULL); + RNDr(S, W, 20, 0x2de92c6f592b0275ULL); + RNDr(S, W, 21, 0x4a7484aa6ea6e483ULL); + RNDr(S, W, 22, 0x5cb0a9dcbd41fbd4ULL); + RNDr(S, W, 23, 0x76f988da831153b5ULL); + RNDr(S, W, 24, 0x983e5152ee66dfabULL); + RNDr(S, W, 25, 0xa831c66d2db43210ULL); + RNDr(S, W, 26, 0xb00327c898fb213fULL); + RNDr(S, W, 27, 0xbf597fc7beef0ee4ULL); + RNDr(S, W, 28, 0xc6e00bf33da88fc2ULL); + RNDr(S, W, 29, 0xd5a79147930aa725ULL); + RNDr(S, W, 30, 0x06ca6351e003826fULL); + RNDr(S, W, 31, 0x142929670a0e6e70ULL); + RNDr(S, W, 32, 0x27b70a8546d22ffcULL); + RNDr(S, W, 33, 0x2e1b21385c26c926ULL); + RNDr(S, W, 34, 0x4d2c6dfc5ac42aedULL); + RNDr(S, W, 35, 0x53380d139d95b3dfULL); + RNDr(S, W, 36, 0x650a73548baf63deULL); + RNDr(S, W, 37, 0x766a0abb3c77b2a8ULL); + RNDr(S, W, 38, 0x81c2c92e47edaee6ULL); + RNDr(S, W, 39, 0x92722c851482353bULL); + RNDr(S, W, 40, 0xa2bfe8a14cf10364ULL); + RNDr(S, W, 41, 0xa81a664bbc423001ULL); + RNDr(S, W, 42, 0xc24b8b70d0f89791ULL); + RNDr(S, W, 43, 0xc76c51a30654be30ULL); + RNDr(S, W, 44, 0xd192e819d6ef5218ULL); + RNDr(S, W, 45, 0xd69906245565a910ULL); + RNDr(S, W, 46, 0xf40e35855771202aULL); + RNDr(S, W, 47, 0x106aa07032bbd1b8ULL); + RNDr(S, W, 48, 0x19a4c116b8d2d0c8ULL); + RNDr(S, W, 49, 0x1e376c085141ab53ULL); + RNDr(S, W, 50, 0x2748774cdf8eeb99ULL); + RNDr(S, W, 51, 0x34b0bcb5e19b48a8ULL); + RNDr(S, W, 52, 0x391c0cb3c5c95a63ULL); + RNDr(S, W, 53, 0x4ed8aa4ae3418acbULL); + RNDr(S, W, 54, 0x5b9cca4f7763e373ULL); + RNDr(S, W, 55, 0x682e6ff3d6b2b8a3ULL); + RNDr(S, W, 56, 0x748f82ee5defb2fcULL); + RNDr(S, W, 57, 0x78a5636f43172f60ULL); + RNDr(S, W, 58, 0x84c87814a1f0ab72ULL); + RNDr(S, W, 59, 0x8cc702081a6439ecULL); + RNDr(S, W, 60, 0x90befffa23631e28ULL); + RNDr(S, W, 61, 0xa4506cebde82bde9ULL); + RNDr(S, W, 62, 0xbef9a3f7b2c67915ULL); + RNDr(S, W, 63, 0xc67178f2e372532bULL); + RNDr(S, W, 64, 0xca273eceea26619cULL); + RNDr(S, W, 65, 0xd186b8c721c0c207ULL); + RNDr(S, W, 66, 0xeada7dd6cde0eb1eULL); + RNDr(S, W, 67, 0xf57d4f7fee6ed178ULL); + RNDr(S, W, 68, 0x06f067aa72176fbaULL); + RNDr(S, W, 69, 0x0a637dc5a2c898a6ULL); + RNDr(S, W, 70, 0x113f9804bef90daeULL); + RNDr(S, W, 71, 0x1b710b35131c471bULL); + RNDr(S, W, 72, 0x28db77f523047d84ULL); + RNDr(S, W, 73, 0x32caab7b40c72493ULL); + RNDr(S, W, 74, 0x3c9ebe0a15c9bebcULL); + RNDr(S, W, 75, 0x431d67c49c100d4cULL); + RNDr(S, W, 76, 0x4cc5d4becb3e42b6ULL); + RNDr(S, W, 77, 0x597f299cfc657e2aULL); + RNDr(S, W, 78, 0x5fcb6fab3ad6faecULL); + RNDr(S, W, 79, 0x6c44198c4a475817ULL); - for (i = 0; i < 8; i++) { - state[i] += S[i]; + for (i = 0; i < 8; i++) { + state[i] += S[i]; } sodium_memzero((void *) W, sizeof W); @@ -216,44 +216,44 @@ SHA512_Transform(uint64_t *state, const unsigned char block[128]) } static unsigned char PAD[128] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; static void SHA512_Pad(crypto_hash_sha512_state *state) { - unsigned char len[16]; - uint64_t r, plen; + unsigned char len[16]; + uint64_t r, plen; - be64enc_vect(len, state->count, 16); + be64enc_vect(len, state->count, 16); - r = (state->count[1] >> 3) & 0x7f; - plen = (r < 112) ? (112 - r) : (240 - r); - crypto_hash_sha512_update(state, PAD, (unsigned long long) plen); + r = (state->count[1] >> 3) & 0x7f; + plen = (r < 112) ? (112 - r) : (240 - r); + crypto_hash_sha512_update(state, PAD, (unsigned long long) plen); - crypto_hash_sha512_update(state, len, 16); + crypto_hash_sha512_update(state, len, 16); } int crypto_hash_sha512_init(crypto_hash_sha512_state *state) { - state->count[0] = state->count[1] = 0; + state->count[0] = state->count[1] = 0; - state->state[0] = 0x6a09e667f3bcc908ULL; - state->state[1] = 0xbb67ae8584caa73bULL; - state->state[2] = 0x3c6ef372fe94f82bULL; - state->state[3] = 0xa54ff53a5f1d36f1ULL; - state->state[4] = 0x510e527fade682d1ULL; - state->state[5] = 0x9b05688c2b3e6c1fULL; - state->state[6] = 0x1f83d9abfb41bd6bULL; - state->state[7] = 0x5be0cd19137e2179ULL; + state->state[0] = 0x6a09e667f3bcc908ULL; + state->state[1] = 0xbb67ae8584caa73bULL; + state->state[2] = 0x3c6ef372fe94f82bULL; + state->state[3] = 0xa54ff53a5f1d36f1ULL; + state->state[4] = 0x510e527fade682d1ULL; + state->state[5] = 0x9b05688c2b3e6c1fULL; + state->state[6] = 0x1f83d9abfb41bd6bULL; + state->state[7] = 0x5be0cd19137e2179ULL; return 0; } @@ -263,35 +263,35 @@ crypto_hash_sha512_update(crypto_hash_sha512_state *state, const unsigned char *in, unsigned long long inlen) { - uint64_t bitlen[2]; - uint64_t r; - const unsigned char *src = in; + uint64_t bitlen[2]; + uint64_t r; + const unsigned char *src = in; - r = (state->count[1] >> 3) & 0x7f; + r = (state->count[1] >> 3) & 0x7f; - bitlen[1] = ((uint64_t)inlen) << 3; - bitlen[0] = ((uint64_t)inlen) >> 61; + bitlen[1] = ((uint64_t)inlen) << 3; + bitlen[0] = ((uint64_t)inlen) >> 61; - if ((state->count[1] += bitlen[1]) < bitlen[1]) { - state->count[0]++; + if ((state->count[1] += bitlen[1]) < bitlen[1]) { + state->count[0]++; } - state->count[0] += bitlen[0]; + state->count[0] += bitlen[0]; - if (inlen < 128 - r) { - memcpy(&state->buf[r], src, inlen); - return 0; - } - memcpy(&state->buf[r], src, 128 - r); - SHA512_Transform(state->state, state->buf); - src += 128 - r; - inlen -= 128 - r; + if (inlen < 128 - r) { + memcpy(&state->buf[r], src, inlen); + return 0; + } + memcpy(&state->buf[r], src, 128 - r); + SHA512_Transform(state->state, state->buf); + src += 128 - r; + inlen -= 128 - r; - while (inlen >= 128) { - SHA512_Transform(state->state, src); - src += 128; - inlen -= 128; - } - memcpy(state->buf, src, inlen); + while (inlen >= 128) { + SHA512_Transform(state->state, src); + src += 128; + inlen -= 128; + } + memcpy(state->buf, src, inlen); return 0; } @@ -300,8 +300,8 @@ int crypto_hash_sha512_final(crypto_hash_sha512_state *state, unsigned char *out) { - SHA512_Pad(state); - be64enc_vect(out, state->state, 64); + SHA512_Pad(state); + be64enc_vect(out, state->state, 64); sodium_memzero((void *) state, sizeof *state); return 0; @@ -319,4 +319,3 @@ crypto_hash(unsigned char *out, const unsigned char *in, return 0; } - From 618b5657d8c930c2c4236b733e3f66f4440b1d32 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 15 Apr 2014 00:21:26 -0700 Subject: [PATCH 50/57] Slightly rename args in sodium_bin2hex() for consistency --- src/libsodium/include/sodium/utils.h | 4 ++-- src/libsodium/sodium/utils.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libsodium/include/sodium/utils.h b/src/libsodium/include/sodium/utils.h index 14b6a747..f9f3875a 100644 --- a/src/libsodium/include/sodium/utils.h +++ b/src/libsodium/include/sodium/utils.h @@ -26,8 +26,8 @@ SODIUM_EXPORT int sodium_memcmp(const void * const b1_, const void * const b2_, size_t size); SODIUM_EXPORT -char *sodium_bin2hex(char * const hex, const size_t hexlen, - const unsigned char *bin, const size_t binlen); +char *sodium_bin2hex(char * const hex, const size_t hex_len, + const unsigned char * const bin, const size_t bin_len); #ifdef __cplusplus } diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c index 2da72fa3..a6afd93d 100644 --- a/src/libsodium/sodium/utils.c +++ b/src/libsodium/sodium/utils.c @@ -77,8 +77,8 @@ _sodium_alignedcalloc(unsigned char ** const unaligned_p, const size_t len) } char * -sodium_bin2hex(char * const hex, const size_t hexlen, - const unsigned char *bin, const size_t binlen) +sodium_bin2hex(char * const hex, const size_t hex_len, + const unsigned char * const bin, const size_t bin_len) { static const char hexdigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', @@ -87,10 +87,10 @@ sodium_bin2hex(char * const hex, const size_t hexlen, size_t i = (size_t) 0U; size_t j = (size_t) 0U; - if (binlen >= SIZE_MAX / 2 || hexlen < binlen * 2U) { + if (bin_len >= SIZE_MAX / 2 || hex_len < bin_len * 2U) { abort(); } - while (i < binlen) { + while (i < bin_len) { hex[j++] = hexdigits[bin[i] >> 4]; hex[j++] = hexdigits[bin[i] & 0xf]; i++; From c6f1a2670a7c9192193ddaf65b6edf267d3093a4 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 15 Apr 2014 00:39:14 -0700 Subject: [PATCH 51/57] Add sodium_hex2bin() --- src/libsodium/include/sodium/utils.h | 8 +++- src/libsodium/sodium/utils.c | 57 +++++++++++++++++++++++++++- test/default/sodium_utils.c | 8 ++++ test/default/sodium_utils.exp | 1 + 4 files changed, 71 insertions(+), 3 deletions(-) diff --git a/src/libsodium/include/sodium/utils.h b/src/libsodium/include/sodium/utils.h index f9f3875a..e962d71d 100644 --- a/src/libsodium/include/sodium/utils.h +++ b/src/libsodium/include/sodium/utils.h @@ -26,9 +26,15 @@ SODIUM_EXPORT int sodium_memcmp(const void * const b1_, const void * const b2_, size_t size); SODIUM_EXPORT -char *sodium_bin2hex(char * const hex, const size_t hex_len, +char *sodium_bin2hex(char * const hex, const size_t hex_maxlen, const unsigned char * const bin, const size_t bin_len); +SODIUM_EXPORT +int sodium_hex2bin(unsigned char * const bin, const size_t bin_maxlen, + const char * const hex, const size_t hex_len, + const char * const ignore, size_t * const bin_len, + const char ** const hex_end); + #ifdef __cplusplus } #endif diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c index a6afd93d..27a0a9f8 100644 --- a/src/libsodium/sodium/utils.c +++ b/src/libsodium/sodium/utils.c @@ -2,6 +2,7 @@ #ifndef __STDC_WANT_LIB_EXT1__ # define __STDC_WANT_LIB_EXT1__ 1 #endif +#include #include #include #include @@ -77,7 +78,7 @@ _sodium_alignedcalloc(unsigned char ** const unaligned_p, const size_t len) } char * -sodium_bin2hex(char * const hex, const size_t hex_len, +sodium_bin2hex(char * const hex, const size_t hex_maxlen, const unsigned char * const bin, const size_t bin_len) { static const char hexdigits[16] = { @@ -87,7 +88,7 @@ sodium_bin2hex(char * const hex, const size_t hex_len, size_t i = (size_t) 0U; size_t j = (size_t) 0U; - if (bin_len >= SIZE_MAX / 2 || hex_len < bin_len * 2U) { + if (bin_len >= SIZE_MAX / 2 || hex_maxlen < bin_len * 2U) { abort(); } while (i < bin_len) { @@ -99,3 +100,55 @@ sodium_bin2hex(char * const hex, const size_t hex_len, return hex; } + +int +sodium_hex2bin(unsigned char * const bin, const size_t bin_maxlen, + const char * const hex, const size_t hex_len, + const char * const ignore, size_t * const bin_len, + const char ** const hex_end) +{ + size_t bin_pos = (size_t) 0U; + size_t hex_pos = (size_t) 0U; + int ret = 0; + unsigned char c; + unsigned char c_acc = 0U; + unsigned char c_num; + unsigned char c_val; + unsigned char state = 0U; + + while (hex_pos < hex_len) { + c = (unsigned char) hex[hex_pos]; + if ((c_num = c ^ 48U) < 10U) { + c_val = c_num; + } else if ((c_num = (c & ~32U)) > 64 && c_num < 71U) { + c_val = c_num - 55U; + } else if (ignore != NULL && strchr(ignore, c) != NULL && state == 0U) { + hex_pos++; + continue; + } else { + break; + } + if (bin_pos >= bin_maxlen) { + ret = -1; + errno = ERANGE; + break; + } + if (state == 0U) { + c_acc = c_val * 16U; + } else { + bin[bin_pos++] = c_acc | c_val; + } + state = ~state; + hex_pos++; + } + if (state != 0U) { + hex_pos--; + } + if (hex_end != NULL) { + *hex_end = &hex[hex_pos]; + } + if (bin_len != NULL) { + *bin_len = bin_pos; + } + return ret; +} diff --git a/test/default/sodium_utils.c b/test/default/sodium_utils.c index 177dbf23..f309cfe6 100644 --- a/test/default/sodium_utils.c +++ b/test/default/sodium_utils.c @@ -9,6 +9,9 @@ int main(void) unsigned char buf1[1000]; unsigned char buf2[1000]; char buf3[33]; + unsigned char buf4[4]; + const char *hex; + size_t bin_len; randombytes(buf1, sizeof buf1); memcpy(buf2, buf1, sizeof buf2); @@ -23,5 +26,10 @@ int main(void) printf("%s\n", sodium_bin2hex(buf3, 33U, (const unsigned char *) "0123456789ABCDEF", 16U)); + hex = "Cafe : 6942"; + sodium_hex2bin(buf4, sizeof buf4, hex, strlen(hex), ": ", &bin_len, NULL); + printf("%zu:%02x%02x%02x%02x\n", bin_len, + buf4[0], buf4[1], buf4[2], buf4[3]); + return 0; } diff --git a/test/default/sodium_utils.exp b/test/default/sodium_utils.exp index 713a1d9b..2be34ae3 100644 --- a/test/default/sodium_utils.exp +++ b/test/default/sodium_utils.exp @@ -4,3 +4,4 @@ 0 0 30313233343536373839414243444546 +4:cafe6942 From 87ebd75469545c22b474dff384f40837244579b8 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 15 Apr 2014 00:42:05 -0700 Subject: [PATCH 52/57] size -> len, for consistency --- src/libsodium/include/sodium/utils.h | 2 +- src/libsodium/sodium/utils.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsodium/include/sodium/utils.h b/src/libsodium/include/sodium/utils.h index e962d71d..aaf3fc5d 100644 --- a/src/libsodium/include/sodium/utils.h +++ b/src/libsodium/include/sodium/utils.h @@ -23,7 +23,7 @@ SODIUM_EXPORT void sodium_memzero(void * const pnt, const size_t len); SODIUM_EXPORT -int sodium_memcmp(const void * const b1_, const void * const b2_, size_t size); +int sodium_memcmp(const void * const b1_, const void * const b2_, size_t len); SODIUM_EXPORT char *sodium_bin2hex(char * const hex, const size_t hex_maxlen, diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c index 27a0a9f8..75e74b08 100644 --- a/src/libsodium/sodium/utils.c +++ b/src/libsodium/sodium/utils.c @@ -36,14 +36,14 @@ sodium_memzero(void * const pnt, const size_t len) } int -sodium_memcmp(const void * const b1_, const void * const b2_, size_t size) +sodium_memcmp(const void * const b1_, const void * const b2_, size_t len) { const unsigned char *b1 = (const unsigned char *) b1_; const unsigned char *b2 = (const unsigned char *) b2_; size_t i; unsigned char d = (unsigned char) 0U; - for (i = 0U; i < size; i++) { + for (i = 0U; i < len; i++) { d |= b1[i] ^ b2[i]; } return (int) ((1 & ((d - 1) >> 8)) - 1); From e9fef026f7ab4b05ebf286f7060b977bcdbbdaf0 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Tue, 15 Apr 2014 19:50:09 -0700 Subject: [PATCH 53/57] Version file that is automatically copied into build directory. --- builds/msvc/version.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 builds/msvc/version.h diff --git a/builds/msvc/version.h b/builds/msvc/version.h new file mode 100644 index 00000000..921abe8d --- /dev/null +++ b/builds/msvc/version.h @@ -0,0 +1,29 @@ + +#ifndef __SODIUM_VERSION_H__ +#define __SODIUM_VERSION_H__ + +#include "export.h" + +#define SODIUM_VERSION_STRING "0.4.5" + +#define SODIUM_LIBRARY_VERSION_MAJOR 4 +#define SODIUM_LIBRARY_VERSION_MINOR 5 + +#ifdef __cplusplus +extern "C" { +#endif + +SODIUM_EXPORT +const char *sodium_version_string(void); + +SODIUM_EXPORT +int sodium_library_version_major(void); + +SODIUM_EXPORT +int sodium_library_version_minor(void); + +#ifdef __cplusplus +} +#endif + +#endif From d54cabd59a3f2f78d628811448d0de5fe75e9d52 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Tue, 15 Apr 2014 19:51:29 -0700 Subject: [PATCH 54/57] Copy version file to source directory for build, with info message. --- builds/msvc/vs2010/libsodium/libsodium.props | 11 +++++++++++ builds/msvc/vs2012/libsodium/libsodium.props | 11 +++++++++++ builds/msvc/vs2013/libsodium/libsodium.props | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/builds/msvc/vs2010/libsodium/libsodium.props b/builds/msvc/vs2010/libsodium/libsodium.props index 33c2c1a6..bcb9b80b 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.props +++ b/builds/msvc/vs2010/libsodium/libsodium.props @@ -7,7 +7,12 @@ false + + + + copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\ + $(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) 4146;4244;%(DisableSpecificWarnings) @@ -18,4 +23,10 @@ + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium/libsodium.props b/builds/msvc/vs2012/libsodium/libsodium.props index 33c2c1a6..bcb9b80b 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.props +++ b/builds/msvc/vs2012/libsodium/libsodium.props @@ -7,7 +7,12 @@ false + + + + copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\ + $(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) 4146;4244;%(DisableSpecificWarnings) @@ -18,4 +23,10 @@ + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.props b/builds/msvc/vs2013/libsodium/libsodium.props index 33c2c1a6..bcb9b80b 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.props +++ b/builds/msvc/vs2013/libsodium/libsodium.props @@ -7,7 +7,12 @@ false + + + + copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\ + $(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) 4146;4244;%(DisableSpecificWarnings) @@ -18,4 +23,10 @@ + + + + + + \ No newline at end of file From de2a274e6a020e62912000c4266afbb32ac31430 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Tue, 15 Apr 2014 19:51:54 -0700 Subject: [PATCH 55/57] Update project files for recent library changes. --- builds/msvc/vs2010/libsodium/libsodium.vcxproj | 8 ++++---- builds/msvc/vs2012/libsodium/libsodium.vcxproj | 8 ++++---- builds/msvc/vs2013/libsodium/libsodium.vcxproj | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj index 6b2b5ab0..5ca60923 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -225,8 +225,9 @@ - - + + + @@ -249,12 +250,11 @@ - + - diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj index 2f7b0048..01caf9bb 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -225,8 +225,9 @@ - - + + + @@ -249,12 +250,11 @@ - + - diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index 80fb7a13..a7433074 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -225,8 +225,9 @@ - - + + + @@ -249,12 +250,11 @@ - + - From 6ede7869ec116a232dc72305fc0fdcbd73fad79c Mon Sep 17 00:00:00 2001 From: evoskuil Date: Tue, 15 Apr 2014 20:31:32 -0700 Subject: [PATCH 56/57] Add two more files to VS build. --- builds/msvc/vs2010/libsodium/libsodium.vcxproj | 10 ++-------- builds/msvc/vs2012/libsodium/libsodium.vcxproj | 10 ++-------- builds/msvc/vs2013/libsodium/libsodium.vcxproj | 10 ++-------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj index 5ca60923..4afb6b30 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -229,10 +229,7 @@ - - - true - + @@ -266,10 +263,7 @@ - - - true - + diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj index 01caf9bb..abdf388c 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -229,10 +229,7 @@ - - - true - + @@ -266,10 +263,7 @@ - - - true - + diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index a7433074..557c8fb8 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -229,10 +229,7 @@ - - - true - + @@ -266,10 +263,7 @@ - - - true - + From fdc5843176044935d310d7f0a6d045eee1e88059 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 15 Apr 2014 20:16:23 -0700 Subject: [PATCH 57/57] Don't use compile-time assertions with sizeof(dynamic length). --- src/libsodium/crypto_box/crypto_box_easy.c | 5 +++-- src/libsodium/crypto_secretbox/crypto_secretbox_easy.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libsodium/crypto_box/crypto_box_easy.c b/src/libsodium/crypto_box/crypto_box_easy.c index 4687cf90..80da4333 100644 --- a/src/libsodium/crypto_box/crypto_box_easy.c +++ b/src/libsodium/crypto_box/crypto_box_easy.c @@ -1,4 +1,5 @@ +#include #include #include #include @@ -41,8 +42,8 @@ crypto_box_easy(unsigned char *c, const unsigned char *m, free(c_boxed); return -1; } - (void) sizeof(char[m_boxed_len - crypto_box_BOXZEROBYTES == - mlen + crypto_box_MACBYTES ? 1 : -1]); + assert(m_boxed_len - crypto_box_BOXZEROBYTES == + mlen + crypto_box_MACBYTES); memcpy(c, c_boxed + crypto_box_BOXZEROBYTES, mlen + crypto_box_MACBYTES); free(c_boxed); diff --git a/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c b/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c index 2199d9f9..e64aae05 100644 --- a/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c +++ b/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c @@ -1,4 +1,5 @@ +#include #include #include #include @@ -41,8 +42,8 @@ crypto_secretbox_easy(unsigned char *c, const unsigned char *m, free(c_boxed); return -1; } - (void) sizeof(char[m_boxed_len - crypto_secretbox_BOXZEROBYTES == - mlen + crypto_secretbox_MACBYTES ? 1 : -1]); + assert(m_boxed_len - crypto_secretbox_BOXZEROBYTES == + mlen + crypto_secretbox_MACBYTES); memcpy(c, c_boxed + crypto_secretbox_BOXZEROBYTES, mlen + crypto_secretbox_MACBYTES); free(c_boxed);