diff --git a/builds/msvc/properties/Common.props b/builds/msvc/properties/Common.props index 2acf2e6f..73b7df1b 100644 --- a/builds/msvc/properties/Common.props +++ b/builds/msvc/properties/Common.props @@ -4,23 +4,19 @@ <_PropertySheetDisplayName>Common Settings Unicode - $(ProjectName) + + + + + true - UNICODE;_UNICODE;%(PreprocessorDefinitions) Level3 - - - - - - - \ No newline at end of file diff --git a/builds/msvc/properties/Dynamic.props b/builds/msvc/properties/DLL.props similarity index 79% rename from builds/msvc/properties/Dynamic.props rename to builds/msvc/properties/DLL.props index 9e749175..b5aa1f07 100644 --- a/builds/msvc/properties/Dynamic.props +++ b/builds/msvc/properties/DLL.props @@ -1,12 +1,10 @@  - - - - - + <_PropertySheetDisplayName>Dynamic Library + dynamic + .dll diff --git a/builds/msvc/properties/Debug.props b/builds/msvc/properties/Debug.props index a2867772..20c00343 100644 --- a/builds/msvc/properties/Debug.props +++ b/builds/msvc/properties/Debug.props @@ -1,11 +1,13 @@  + + + + - <_PropertySheetDisplayName>Debug Configuration - - $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ - $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\ + <_PropertySheetDisplayName>Debug Settings + debug @@ -21,8 +23,7 @@ true - $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib - + \ No newline at end of file diff --git a/builds/msvc/properties/ConsoleDebugDynamic.props b/builds/msvc/properties/DebugDEXE.props similarity index 79% rename from builds/msvc/properties/ConsoleDebugDynamic.props rename to builds/msvc/properties/DebugDEXE.props index 5872b5c4..fe8b577f 100644 --- a/builds/msvc/properties/ConsoleDebugDynamic.props +++ b/builds/msvc/properties/DebugDEXE.props @@ -1,18 +1,18 @@  - - - - - <_PropertySheetDisplayName>Console Debug Dynamic + dynamic + + + + + - MultiThreadedDebugDLL true diff --git a/builds/msvc/properties/DynamicDebug.props b/builds/msvc/properties/DebugDLL.props similarity index 79% rename from builds/msvc/properties/DynamicDebug.props rename to builds/msvc/properties/DebugDLL.props index ee40a01f..a451d0bf 100644 --- a/builds/msvc/properties/DynamicDebug.props +++ b/builds/msvc/properties/DebugDLL.props @@ -1,21 +1,20 @@  - - - - - <_PropertySheetDisplayName>Dynamic Debug Library + + + + + - MultiThreadedDebugDLL true - + \ No newline at end of file diff --git a/builds/msvc/properties/ConsoleDebugLinkTimeCodeGeneration.props b/builds/msvc/properties/DebugLEXE.props similarity index 71% rename from builds/msvc/properties/ConsoleDebugLinkTimeCodeGeneration.props rename to builds/msvc/properties/DebugLEXE.props index 1e752c21..7fa92c03 100644 --- a/builds/msvc/properties/ConsoleDebugLinkTimeCodeGeneration.props +++ b/builds/msvc/properties/DebugLEXE.props @@ -1,20 +1,19 @@  - - - - - - - <_PropertySheetDisplayName>Console Debug Link Time Code Generation Library + <_PropertySheetDisplayName>Console Debug Link Time Code Generation + + + + + + MultiThreadedDebug - false diff --git a/builds/msvc/properties/StaticDebug.props b/builds/msvc/properties/DebugLIB.props similarity index 80% rename from builds/msvc/properties/StaticDebug.props rename to builds/msvc/properties/DebugLIB.props index 8668424c..8c7a3086 100644 --- a/builds/msvc/properties/StaticDebug.props +++ b/builds/msvc/properties/DebugLIB.props @@ -1,18 +1,17 @@  - - - - - <_PropertySheetDisplayName>Static Debug Library + + + + + - MultiThreadedDebug true diff --git a/builds/msvc/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/properties/DebugLTCG.props similarity index 71% rename from builds/msvc/properties/StaticDebugLinkTimeCodeGeneration.props rename to builds/msvc/properties/DebugLTCG.props index a35e0e7a..8dafd5f4 100644 --- a/builds/msvc/properties/StaticDebugLinkTimeCodeGeneration.props +++ b/builds/msvc/properties/DebugLTCG.props @@ -1,20 +1,18 @@  - - - - - <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library + + + + + - MultiThreadedDebug - false diff --git a/builds/msvc/properties/ConsoleDebugStatic.props b/builds/msvc/properties/DebugSEXE.props similarity index 85% rename from builds/msvc/properties/ConsoleDebugStatic.props rename to builds/msvc/properties/DebugSEXE.props index 5d72bbc4..2615ffcf 100644 --- a/builds/msvc/properties/ConsoleDebugStatic.props +++ b/builds/msvc/properties/DebugSEXE.props @@ -1,15 +1,16 @@  - - - - - <_PropertySheetDisplayName>Console Debug Static + static + + + + + MultiThreadedDebug diff --git a/builds/msvc/properties/Console.props b/builds/msvc/properties/EXE.props similarity index 81% rename from builds/msvc/properties/Console.props rename to builds/msvc/properties/EXE.props index 414c98ae..35490645 100644 --- a/builds/msvc/properties/Console.props +++ b/builds/msvc/properties/EXE.props @@ -1,12 +1,9 @@  - - - - - + <_PropertySheetDisplayName>Console Application + true diff --git a/builds/msvc/properties/Static.props b/builds/msvc/properties/LIB.props similarity index 79% rename from builds/msvc/properties/Static.props rename to builds/msvc/properties/LIB.props index 85207e49..3835777c 100644 --- a/builds/msvc/properties/Static.props +++ b/builds/msvc/properties/LIB.props @@ -1,12 +1,10 @@  - - - - <_PropertySheetDisplayName>Static Library + static + .lib diff --git a/builds/msvc/properties/LTCG.props b/builds/msvc/properties/LTCG.props new file mode 100644 index 00000000..02292938 --- /dev/null +++ b/builds/msvc/properties/LTCG.props @@ -0,0 +1,13 @@ + + + + + <_PropertySheetDisplayName>Link Time Code Generation Library + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/properties/LinkTimeCodeGeneration.props b/builds/msvc/properties/Link.props similarity index 77% rename from builds/msvc/properties/LinkTimeCodeGeneration.props rename to builds/msvc/properties/Link.props index 644462f0..db15fbb4 100644 --- a/builds/msvc/properties/LinkTimeCodeGeneration.props +++ b/builds/msvc/properties/Link.props @@ -2,7 +2,8 @@ - <_PropertySheetDisplayName>Link Time Code Generation Library + <_PropertySheetDisplayName>Link Time Code Generation Settings + ltcg diff --git a/builds/msvc/properties/Messages.props b/builds/msvc/properties/Messages.props new file mode 100644 index 00000000..ff503c32 --- /dev/null +++ b/builds/msvc/properties/Messages.props @@ -0,0 +1,16 @@ + + + + + <_PropertySheetDisplayName>Build Messages + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/properties/Output.props b/builds/msvc/properties/Output.props new file mode 100644 index 00000000..74f73a83 --- /dev/null +++ b/builds/msvc/properties/Output.props @@ -0,0 +1,29 @@ + + + + + <_PropertySheetDisplayName>Output Settings + $(ProjectDir)..\..\ + $(ProjectDir)..\..\..\..\ + $(ProjectDir)..\..\..\..\..\ + $(RepoRoot)bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(DefaultLinkage)\ + $(RepoRoot)obj\$(TargetName)\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(DefaultLinkage)\ + $(OutDir) + $(TargetName) + $(TargetDir)$(TargetName)$(TargetExt) + + + + + $(OutDir)$(TargetName).lib + + + $(OutDir)$(TargetName).log + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/properties/Release.props b/builds/msvc/properties/Release.props index c2111288..748f614a 100644 --- a/builds/msvc/properties/Release.props +++ b/builds/msvc/properties/Release.props @@ -1,11 +1,13 @@  + + + + - <_PropertySheetDisplayName>Release Configuration - - $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ - $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\ + <_PropertySheetDisplayName>Release Settings + release false @@ -26,12 +28,11 @@ true - $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib true - + - + StreamingSIMDExtensions2 diff --git a/builds/msvc/properties/ConsoleReleaseDynamic.props b/builds/msvc/properties/ReleaseDEXE.props similarity index 78% rename from builds/msvc/properties/ConsoleReleaseDynamic.props rename to builds/msvc/properties/ReleaseDEXE.props index f15070dd..b89b373a 100644 --- a/builds/msvc/properties/ConsoleReleaseDynamic.props +++ b/builds/msvc/properties/ReleaseDEXE.props @@ -1,18 +1,18 @@  - - - - - <_PropertySheetDisplayName>Console Release Dynamic + dynamic + + + + + - MultiThreadedDebugDLL diff --git a/builds/msvc/properties/DynamicRelease.props b/builds/msvc/properties/ReleaseDLL.props similarity index 78% rename from builds/msvc/properties/DynamicRelease.props rename to builds/msvc/properties/ReleaseDLL.props index c3f36f89..2071b33f 100644 --- a/builds/msvc/properties/DynamicRelease.props +++ b/builds/msvc/properties/ReleaseDLL.props @@ -1,18 +1,17 @@  - - - - - <_PropertySheetDisplayName>Dynamic Release Library + + + + + - MultiThreadedDLL diff --git a/builds/msvc/properties/ConsoleReleaseLinkTimeCodeGeneration.props b/builds/msvc/properties/ReleaseLEXE.props similarity index 76% rename from builds/msvc/properties/ConsoleReleaseLinkTimeCodeGeneration.props rename to builds/msvc/properties/ReleaseLEXE.props index 984891b3..beb73ef2 100644 --- a/builds/msvc/properties/ConsoleReleaseLinkTimeCodeGeneration.props +++ b/builds/msvc/properties/ReleaseLEXE.props @@ -1,16 +1,16 @@  - - - - - - - <_PropertySheetDisplayName>Console Release Link Time Code Generation Library + <_PropertySheetDisplayName>Console Release Link Time Code Generation + + + + + + MultiThreaded diff --git a/builds/msvc/properties/StaticRelease.props b/builds/msvc/properties/ReleaseLIB.props similarity index 78% rename from builds/msvc/properties/StaticRelease.props rename to builds/msvc/properties/ReleaseLIB.props index 5eaadae8..2b250d57 100644 --- a/builds/msvc/properties/StaticRelease.props +++ b/builds/msvc/properties/ReleaseLIB.props @@ -1,18 +1,17 @@  - - - - - <_PropertySheetDisplayName>Static Release Library + + + + + - MultiThreaded diff --git a/builds/msvc/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/properties/ReleaseLTCG.props similarity index 76% rename from builds/msvc/properties/StaticReleaseLinkTimeCodeGeneration.props rename to builds/msvc/properties/ReleaseLTCG.props index 4515bef4..1814c6f3 100644 --- a/builds/msvc/properties/StaticReleaseLinkTimeCodeGeneration.props +++ b/builds/msvc/properties/ReleaseLTCG.props @@ -1,18 +1,17 @@  - - - - - <_PropertySheetDisplayName>Static Release Link Time Code Generation Library + + + + + - MultiThreaded diff --git a/builds/msvc/properties/ConsoleReleaseStatic.props b/builds/msvc/properties/ReleaseSEXE.props similarity index 84% rename from builds/msvc/properties/ConsoleReleaseStatic.props rename to builds/msvc/properties/ReleaseSEXE.props index 2aaf3032..2f5600a0 100644 --- a/builds/msvc/properties/ConsoleReleaseStatic.props +++ b/builds/msvc/properties/ReleaseSEXE.props @@ -1,15 +1,16 @@  - - - - - <_PropertySheetDisplayName>Console Release Static + static + + + + + MultiThreaded diff --git a/builds/msvc/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/properties/StaticLinkTimeCodeGeneration.props deleted file mode 100644 index 6a8d8837..00000000 --- a/builds/msvc/properties/StaticLinkTimeCodeGeneration.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - <_PropertySheetDisplayName>Static Link Time Code Generation Library - - - $(TargetName).ltcg - - - \ No newline at end of file diff --git a/builds/msvc/properties/x64.props b/builds/msvc/properties/x64.props index ddf9c14a..90e30340 100644 --- a/builds/msvc/properties/x64.props +++ b/builds/msvc/properties/x64.props @@ -3,8 +3,9 @@ <_PropertySheetDisplayName>x64 Settings + x64 - + - - - - - + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium/libsodium.props b/builds/msvc/vs2010/libsodium/libsodium.props index bcb9b80b..7e9bca4f 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.props +++ b/builds/msvc/vs2010/libsodium/libsodium.props @@ -6,27 +6,38 @@ AllRules.ruleset false + + + + + + - copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\ + copy $(BuildRoot)version.h $(RepoRoot)src\libsodium\include\sodium\ - $(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + $(RepoRoot)src\libsodium\include;$(RepoRoot)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) + HAVE_AMD64_ASM;%(PreprocessorDefinitions) - + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj index 1b56b1e0..add11021 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -3,7 +3,7 @@ {A185B162-6CB6-4502-B03F-B56F7699A8D9} libsodium - libsodium10 + v100 @@ -55,9 +55,6 @@ x64 - - v100 - DynamicLibrary @@ -93,142 +90,214 @@ StaticLibrary - + - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + - - - + + + + - - + + + - - - + - + + + - - + + - + + - + + + + + + + + + + + @@ -245,64 +314,94 @@ + + + + + - + + + + + - + + + + + + - + + + + + + + - + + + + - + + + + + + + - + + - - - - + + - - - + + - + + + + @@ -311,12 +410,13 @@ - - - + + + + @@ -329,4 +429,4 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters index d8a14326..9af69a14 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters @@ -1,404 +1,776 @@  - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - 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 - - - resource - include + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_auth\hmacsha256 + + + src\crypto_auth\hmacsha512256 + + + src\crypto_onetimeauth\poly1305\donna + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_generichash\blake2\ref + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_box\curve25519xsalsa20poly1305 + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_core\hsalsa20\ref2 + + + src\crypto_core\hsalsa20 + + + src\crypto_core\salsa20\ref + + + src\crypto_core\salsa20 + + + src\crypto_core\salsa208\ref + + + src\crypto_core\salsa208 + + + src\crypto_core\salsa2012 + + + src\crypto_core\salsa2012 + + + src\crypto_auth + + + src\crypto_box + + + src\crypto_generichash + + + src\crypto_hash + + + src\crypto_onetimeauth + + + src\crypto_scalarmult + + + src\crypto_secretbox + + + src\crypto_shorthash + + + src\crypto_sign + + + src\crypto_stream + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_generichash\blake2 + + + src\crypto_generichash\blake2\ref + + + src\crypto_hash\sha256 + + + src\crypto_hash\sha512 + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_onetimeauth\poly1305 + + + src\crypto_onetimeauth\poly1305 + + + src\crypto_onetimeauth\poly1305 + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_scalarmult\curve25519 + + + src\crypto_secretbox\xsalsa20poly1305 + + + src\crypto_shorthash\siphash24\ref + + + src\crypto_shorthash\siphash24 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_sign\edwards25519sha512batch + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes128ctr + + + src\crypto_stream\aes256estream + + + src\crypto_stream\salsa20 + + + src\crypto_stream\salsa208\ref + + + src\crypto_stream\salsa208 + + + src\crypto_stream\salsa2012\ref + + + src\crypto_stream\salsa2012 + + + src\crypto_stream\xsalsa20\ref + + + src\crypto_stream\xsalsa20 + + + src\crypto_onetimeauth\poly1305\donna + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\salsa208\ref + + + src\crypto_stream\salsa2012\ref + + + src\crypto_stream\xsalsa20\ref + + + src\crypto_box + + + src\crypto_secretbox + + + src\crypto_hash\sha256\cp + + + src\crypto_auth\hmacsha256\cp + + + src\crypto_auth\hmacsha256\cp + + + src\crypto_hash\sha512\cp + + + src\crypto_auth\hmacsha512\cp + + + src\crypto_auth\hmacsha512256\cp + + + src\crypto_auth\hmacsha512256\cp + + + src\sodium + + + src\sodium + + + src\sodium + + + src\sodium + + + src\randombytes + + + src\crypto_verify\16 + + + src\crypto_verify\32 + + + src\crypto_verify\64 + + + src\crypto_verify\64\ref + + + src\crypto_verify\32\ref + + + src\crypto_verify\16\ref + + + src\randombytes\salsa20 + + + src\randombytes\sysrandom + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_auth\hmacsha512 + + + src\crypto_generichash\blake2\ref + + + src\crypto_generichash\blake2\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_auth\hmacsha512\cp + + + src\crypto_secretbox\xsalsa20poly1305\ref + + + src\sodium + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_pwhash\scryptxsalsa208sha256\nosse + + + src\crypto_pwhash\scryptxsalsa208sha256\sse + + + src\crypto_auth\hmacsha512256\cp + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_generichash\blake2\ref + + + src\crypto_hash\sha256\cp + + + src\crypto_hash\sha512\cp + + + src\crypto_onetimeauth\poly1305\donna + + + src\crypto_secretbox\xsalsa20poly1305\ref + + + src\crypto_shorthash\siphash24\ref + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_verify\16\ref + + + src\crypto_verify\32\ref + + + src\crypto_verify\64\ref + + + src\crypto_scalarmult\curve25519\donna_c64 + + + src\crypto_scalarmult\curve25519\donna_c64 + + + src\crypto_scalarmult\curve25519\ref + + + src\crypto_scalarmult\curve25519\ref + + + src\crypto_stream\salsa20\ref + + + src\crypto_stream\salsa20\ref + + + src\crypto_core\salsa20\ref + + + src\crypto_core\salsa208\ref + + + src\crypto_core\salsa2012\ref + + + src\crypto_core\hsalsa20\ref2 + + + src\crypto_stream\salsa208\ref + + + src\crypto_stream\salsa2012\ref + + + src\crypto_stream\xsalsa20\ref + + + src\crypto_scalarmult\curve25519\donna_c64 + + + src\crypto_scalarmult\curve25519\ref + + + src\crypto_stream\salsa20\ref + + + src\crypto_stream\salsa20\amd64_xmm6 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_auth\hmacsha256\cp + + + src\crypto_auth\hmacsha512\cp + + + + + resource + + + resource + @@ -416,6 +788,12 @@ packaging + + packaging + + + src\crypto_stream\salsa20\amd64_xmm6 + @@ -424,21 +802,236 @@ {ddaca9ce-4d7d-4395-bfd2-2eda05bc80c2} + + {C7DE5B24-B5D1-47D0-A83A-8C9A123D782C} + {b320f6a3-36a4-4b22-8c21-da7d2e12211a} {983480f9-7320-4c01-b926-ee8dead5b916} - - - - packaging - - - - - resource - + + {02bdfd8e-f5c5-4574-bbbb-c74529732ce6} + + + {a71cc7f9-91b7-4e8f-af53-6ffb34361504} + + + {e0e40095-6fcc-4d17-892c-59dbde8eecef} + + + {2a770536-f29b-4ec2-9abe-8e197f6568d3} + + + {61deff4c-da3d-4818-be86-f303cafafdf7} + + + {d7a19b71-c3e8-4269-9196-b84b75f80ea3} + + + {a355e921-720c-400f-baa6-1ad7c92b0965} + + + {8ec29d92-3133-45d3-918b-ec83736d8fad} + + + {accf7bea-bb27-42b6-94ab-a61c5d33d2a8} + + + {5b07228e-b709-44ed-a064-f955f12346b0} + + + {7d8294db-7351-4e51-8eaf-2c5cf480babb} + + + {9646b8af-9356-4554-901a-01d788977c8f} + + + {51474f49-0245-4469-ad60-1232b070f485} + + + {076ae5b6-e83f-4dfd-8ad1-1cf9498163cf} + + + {561681e2-2540-4d96-beab-1ab5d4c917c1} + + + {120ddd61-6cd1-4942-98c4-d6f0d935561d} + + + {e368d8fe-75aa-4ae4-9108-44d7d2d6dd45} + + + {9c9ccf6a-9ddc-474f-b037-7283a2062441} + + + {a1d49972-da2e-4287-a896-3895b07b8bb6} + + + {d57353dc-ff60-4ff7-95e1-76413f5b7412} + + + {abbfd1ef-8471-4249-a8ba-2127e6ec0d3e} + + + {b6607f53-b7ec-4e2f-b3be-005ec71ebbc8} + + + {2382394d-2013-4992-a192-925667930038} + + + {e3443408-7481-46b8-b7d1-b0934db097af} + + + {7b3b0e11-3a29-4041-8ff3-b2db3515a7ea} + + + {7b85001b-afbc-47ef-b9bc-2e88d42706b9} + + + {84e229c4-90ec-44ff-bc45-4f3124d1a76a} + + + {38f6b495-9ac2-466f-a5f5-6f167c962782} + + + {6e16e561-ad11-4163-b7f5-0f54e5a6be21} + + + {defadbf0-a430-4113-b592-5bb8ccfb3db8} + + + {0ee43c44-b79e-407c-a81b-87e087125c2a} + + + {7d028278-1392-4552-94ab-3b6ddc7d6244} + + + {e82bcfa5-052a-44af-a842-103f82afb038} + + + {8974bffa-329d-4c43-a335-1ef524931734} + + + {b788850f-cd6a-49bb-a2fc-5dc217fb21a3} + + + {4dd0cec6-9024-4ca9-ad9f-e877e0aa4e39} + + + {bcf30ce5-e8cc-4c02-9411-1a493f7d0d2d} + + + {f2d8043a-ea27-4c13-abae-12dfacbf9b2f} + + + {72eb89ac-4a14-4edb-8e0f-2e7f83de9ee3} + + + {b4a8182e-ac68-44ff-9326-4cc0a9061ed8} + + + {229af36f-3c18-4cbf-8b60-84a04be8506e} + + + {ca40b775-e025-4359-87ae-02c771c1a222} + + + {afb86556-101b-407c-93f6-db784a9e3f4f} + + + {91c31952-2f36-418e-aa07-68ed57057d0f} + + + {6aaac1e4-ac4e-4ffb-8bbc-7eb2a7882720} + + + {a4f08471-9539-4f8c-af00-b94d0755bd68} + + + {8d2310cb-954e-4a9e-83bc-89258c241470} + + + {088d0208-228e-4fd3-989b-cc548cecf9cb} + + + {61ae16a0-1ba1-453d-a77c-db86d2be0568} + + + {1c006197-b25b-48e8-833f-2dd59a571b9d} + + + {3acc42ca-4646-462d-bbac-2a07e9eb30be} + + + {46eb8265-dc41-4289-aa7d-c1918e05cf75} + + + {e1301424-0353-47a8-9f5d-2c6f19bdac10} + + + {996fa5e1-cf7e-4b97-a502-edc874ee020d} + + + {4a1f7816-c9b5-4cfc-a4f3-54d094e13520} + + + {629a0d99-8735-4761-b41b-b2a91b1fdffa} + + + {08465b05-7a80-40b5-bbe5-31914fdd6e7e} + + + {280d66b5-3cf2-47b0-b3a9-2e3035267cb0} + + + {b7e800ab-220d-49ce-b083-52fd69f5c0d0} + + + {83290051-5254-49d1-9681-7e075d369f2f} + + + {df0550dd-1947-4a0f-813a-9c52a3c92d30} + + + {7800c160-ebba-47a3-bce5-513c8d59c721} + + + {d245433a-5e44-4984-8bf4-e3eabfd01080} + + + {9d51019b-0714-4c0f-b110-b796b744b3b9} + + + {e07ef1ae-589b-4aba-95d7-828098035aba} + + + {5b1a5bc3-65ad-4493-a29d-009300622f59} + + + {ff4c9104-e49a-4a1a-8072-efd241caf957} + + + {0a601d97-867d-43c6-896a-037d3ccb1b64} + + + {c390ac60-d84b-4ba9-bdf8-d893e3c5a762} + + + {3062daf0-5f1a-4d51-b52d-809b05b5497d} + + + {0f487f99-d651-4965-b2e6-5da1a04b2f43} + + + {c34cd67a-50d6-49a5-bcdd-afaa2ca9acd4} + + + {b5ca06e6-3e8f-4c47-9896-d97976c1b1ba} + + + {99f433de-7c93-48d2-9e94-0e43420b2c09} + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium/libsodium.xml b/builds/msvc/vs2010/libsodium/libsodium.xml new file mode 100644 index 00000000..808ccb9f --- /dev/null +++ b/builds/msvc/vs2010/libsodium/libsodium.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/test/test.props b/builds/msvc/vs2010/test/test.props index f3097cda..ce5e9106 100644 --- a/builds/msvc/vs2010/test/test.props +++ b/builds/msvc/vs2010/test/test.props @@ -8,10 +8,10 @@ - + - $(ProjectDir)..\..\..\..\test\default\;$(ProjectDir)..\..\..\..\test\quirks\;%(AdditionalIncludeDirectories) + $(RepoRoot)test\default\;$(RepoRoot)test\quirks\;%(AdditionalIncludeDirectories) false _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -24,14 +24,8 @@ - - dynamic - - - ltcg - - - static + + $(DefaultLinkage) diff --git a/builds/msvc/vs2010/test/test.vcxproj b/builds/msvc/vs2010/test/test.vcxproj index 303cd804..7532d87a 100644 --- a/builds/msvc/vs2010/test/test.vcxproj +++ b/builds/msvc/vs2010/test/test.vcxproj @@ -1,88 +1,11 @@  - + {4EDBA07C-2F08-4C9E-805F-A4921814C117} test - test10 - - v100 Application - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DebugDEXE @@ -133,6 +56,68 @@ x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false @@ -159,11 +144,9 @@ true - true - true @@ -208,6 +191,9 @@ true + + true + true @@ -242,16 +228,17 @@ true - true - true true + + true + true diff --git a/builds/msvc/vs2010/test/test.vcxproj.filters b/builds/msvc/vs2010/test/test.vcxproj.filters index e959e04d..a0f3fd7d 100644 --- a/builds/msvc/vs2010/test/test.vcxproj.filters +++ b/builds/msvc/vs2010/test/test.vcxproj.filters @@ -142,6 +142,12 @@ src + + src + + + src + diff --git a/builds/msvc/vs2012/libsodium.import.props b/builds/msvc/vs2012/libsodium.import.props index 5ef05ecf..550d43ec 100644 --- a/builds/msvc/vs2012/libsodium.import.props +++ b/builds/msvc/vs2012/libsodium.import.props @@ -15,65 +15,32 @@ - $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + $(SourceRoot)libsodium\src\libsodium\include;$(SourceRoot)libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + SODIUM_STATIC;%(PreprocessorDefinitions) - - - - - 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) + + advapi32.lib;crypt32.lib;%(AdditionalDependencies) + $(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.lib;%(AdditionalDependencies) - - - - - + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium/libsodium.props b/builds/msvc/vs2012/libsodium/libsodium.props index bcb9b80b..7e9bca4f 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.props +++ b/builds/msvc/vs2012/libsodium/libsodium.props @@ -6,27 +6,38 @@ AllRules.ruleset false + + + + + + - copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\ + copy $(BuildRoot)version.h $(RepoRoot)src\libsodium\include\sodium\ - $(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + $(RepoRoot)src\libsodium\include;$(RepoRoot)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) + HAVE_AMD64_ASM;%(PreprocessorDefinitions) - + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj index 16870dd9..26ee74ff 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -3,7 +3,7 @@ {A185B162-6CB6-4502-B03F-B56F7699A8D9} libsodium - libsodium11 + v110 @@ -55,9 +55,6 @@ x64 - - v110 - DynamicLibrary @@ -93,142 +90,214 @@ StaticLibrary - + - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + - - - + + + + - - + + + - - - + - + + + - - + + - + + - + + + + + + + + + + + @@ -245,64 +314,94 @@ + + + + + - + + + + + - + + + + + + - + + + + + + + - + + + + - + + + + + + + - + + - - - - + + - - - + + - + + + + @@ -311,12 +410,13 @@ - - - + + + + @@ -329,4 +429,4 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters index d8a14326..9af69a14 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters @@ -1,404 +1,776 @@  - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - 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 - - - resource - include + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_auth\hmacsha256 + + + src\crypto_auth\hmacsha512256 + + + src\crypto_onetimeauth\poly1305\donna + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_generichash\blake2\ref + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_box\curve25519xsalsa20poly1305 + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_core\hsalsa20\ref2 + + + src\crypto_core\hsalsa20 + + + src\crypto_core\salsa20\ref + + + src\crypto_core\salsa20 + + + src\crypto_core\salsa208\ref + + + src\crypto_core\salsa208 + + + src\crypto_core\salsa2012 + + + src\crypto_core\salsa2012 + + + src\crypto_auth + + + src\crypto_box + + + src\crypto_generichash + + + src\crypto_hash + + + src\crypto_onetimeauth + + + src\crypto_scalarmult + + + src\crypto_secretbox + + + src\crypto_shorthash + + + src\crypto_sign + + + src\crypto_stream + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_generichash\blake2 + + + src\crypto_generichash\blake2\ref + + + src\crypto_hash\sha256 + + + src\crypto_hash\sha512 + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_onetimeauth\poly1305 + + + src\crypto_onetimeauth\poly1305 + + + src\crypto_onetimeauth\poly1305 + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_scalarmult\curve25519 + + + src\crypto_secretbox\xsalsa20poly1305 + + + src\crypto_shorthash\siphash24\ref + + + src\crypto_shorthash\siphash24 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_sign\edwards25519sha512batch + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes128ctr + + + src\crypto_stream\aes256estream + + + src\crypto_stream\salsa20 + + + src\crypto_stream\salsa208\ref + + + src\crypto_stream\salsa208 + + + src\crypto_stream\salsa2012\ref + + + src\crypto_stream\salsa2012 + + + src\crypto_stream\xsalsa20\ref + + + src\crypto_stream\xsalsa20 + + + src\crypto_onetimeauth\poly1305\donna + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\salsa208\ref + + + src\crypto_stream\salsa2012\ref + + + src\crypto_stream\xsalsa20\ref + + + src\crypto_box + + + src\crypto_secretbox + + + src\crypto_hash\sha256\cp + + + src\crypto_auth\hmacsha256\cp + + + src\crypto_auth\hmacsha256\cp + + + src\crypto_hash\sha512\cp + + + src\crypto_auth\hmacsha512\cp + + + src\crypto_auth\hmacsha512256\cp + + + src\crypto_auth\hmacsha512256\cp + + + src\sodium + + + src\sodium + + + src\sodium + + + src\sodium + + + src\randombytes + + + src\crypto_verify\16 + + + src\crypto_verify\32 + + + src\crypto_verify\64 + + + src\crypto_verify\64\ref + + + src\crypto_verify\32\ref + + + src\crypto_verify\16\ref + + + src\randombytes\salsa20 + + + src\randombytes\sysrandom + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_auth\hmacsha512 + + + src\crypto_generichash\blake2\ref + + + src\crypto_generichash\blake2\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_auth\hmacsha512\cp + + + src\crypto_secretbox\xsalsa20poly1305\ref + + + src\sodium + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_pwhash\scryptxsalsa208sha256\nosse + + + src\crypto_pwhash\scryptxsalsa208sha256\sse + + + src\crypto_auth\hmacsha512256\cp + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_generichash\blake2\ref + + + src\crypto_hash\sha256\cp + + + src\crypto_hash\sha512\cp + + + src\crypto_onetimeauth\poly1305\donna + + + src\crypto_secretbox\xsalsa20poly1305\ref + + + src\crypto_shorthash\siphash24\ref + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_verify\16\ref + + + src\crypto_verify\32\ref + + + src\crypto_verify\64\ref + + + src\crypto_scalarmult\curve25519\donna_c64 + + + src\crypto_scalarmult\curve25519\donna_c64 + + + src\crypto_scalarmult\curve25519\ref + + + src\crypto_scalarmult\curve25519\ref + + + src\crypto_stream\salsa20\ref + + + src\crypto_stream\salsa20\ref + + + src\crypto_core\salsa20\ref + + + src\crypto_core\salsa208\ref + + + src\crypto_core\salsa2012\ref + + + src\crypto_core\hsalsa20\ref2 + + + src\crypto_stream\salsa208\ref + + + src\crypto_stream\salsa2012\ref + + + src\crypto_stream\xsalsa20\ref + + + src\crypto_scalarmult\curve25519\donna_c64 + + + src\crypto_scalarmult\curve25519\ref + + + src\crypto_stream\salsa20\ref + + + src\crypto_stream\salsa20\amd64_xmm6 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_auth\hmacsha256\cp + + + src\crypto_auth\hmacsha512\cp + + + + + resource + + + resource + @@ -416,6 +788,12 @@ packaging + + packaging + + + src\crypto_stream\salsa20\amd64_xmm6 + @@ -424,21 +802,236 @@ {ddaca9ce-4d7d-4395-bfd2-2eda05bc80c2} + + {C7DE5B24-B5D1-47D0-A83A-8C9A123D782C} + {b320f6a3-36a4-4b22-8c21-da7d2e12211a} {983480f9-7320-4c01-b926-ee8dead5b916} - - - - packaging - - - - - resource - + + {02bdfd8e-f5c5-4574-bbbb-c74529732ce6} + + + {a71cc7f9-91b7-4e8f-af53-6ffb34361504} + + + {e0e40095-6fcc-4d17-892c-59dbde8eecef} + + + {2a770536-f29b-4ec2-9abe-8e197f6568d3} + + + {61deff4c-da3d-4818-be86-f303cafafdf7} + + + {d7a19b71-c3e8-4269-9196-b84b75f80ea3} + + + {a355e921-720c-400f-baa6-1ad7c92b0965} + + + {8ec29d92-3133-45d3-918b-ec83736d8fad} + + + {accf7bea-bb27-42b6-94ab-a61c5d33d2a8} + + + {5b07228e-b709-44ed-a064-f955f12346b0} + + + {7d8294db-7351-4e51-8eaf-2c5cf480babb} + + + {9646b8af-9356-4554-901a-01d788977c8f} + + + {51474f49-0245-4469-ad60-1232b070f485} + + + {076ae5b6-e83f-4dfd-8ad1-1cf9498163cf} + + + {561681e2-2540-4d96-beab-1ab5d4c917c1} + + + {120ddd61-6cd1-4942-98c4-d6f0d935561d} + + + {e368d8fe-75aa-4ae4-9108-44d7d2d6dd45} + + + {9c9ccf6a-9ddc-474f-b037-7283a2062441} + + + {a1d49972-da2e-4287-a896-3895b07b8bb6} + + + {d57353dc-ff60-4ff7-95e1-76413f5b7412} + + + {abbfd1ef-8471-4249-a8ba-2127e6ec0d3e} + + + {b6607f53-b7ec-4e2f-b3be-005ec71ebbc8} + + + {2382394d-2013-4992-a192-925667930038} + + + {e3443408-7481-46b8-b7d1-b0934db097af} + + + {7b3b0e11-3a29-4041-8ff3-b2db3515a7ea} + + + {7b85001b-afbc-47ef-b9bc-2e88d42706b9} + + + {84e229c4-90ec-44ff-bc45-4f3124d1a76a} + + + {38f6b495-9ac2-466f-a5f5-6f167c962782} + + + {6e16e561-ad11-4163-b7f5-0f54e5a6be21} + + + {defadbf0-a430-4113-b592-5bb8ccfb3db8} + + + {0ee43c44-b79e-407c-a81b-87e087125c2a} + + + {7d028278-1392-4552-94ab-3b6ddc7d6244} + + + {e82bcfa5-052a-44af-a842-103f82afb038} + + + {8974bffa-329d-4c43-a335-1ef524931734} + + + {b788850f-cd6a-49bb-a2fc-5dc217fb21a3} + + + {4dd0cec6-9024-4ca9-ad9f-e877e0aa4e39} + + + {bcf30ce5-e8cc-4c02-9411-1a493f7d0d2d} + + + {f2d8043a-ea27-4c13-abae-12dfacbf9b2f} + + + {72eb89ac-4a14-4edb-8e0f-2e7f83de9ee3} + + + {b4a8182e-ac68-44ff-9326-4cc0a9061ed8} + + + {229af36f-3c18-4cbf-8b60-84a04be8506e} + + + {ca40b775-e025-4359-87ae-02c771c1a222} + + + {afb86556-101b-407c-93f6-db784a9e3f4f} + + + {91c31952-2f36-418e-aa07-68ed57057d0f} + + + {6aaac1e4-ac4e-4ffb-8bbc-7eb2a7882720} + + + {a4f08471-9539-4f8c-af00-b94d0755bd68} + + + {8d2310cb-954e-4a9e-83bc-89258c241470} + + + {088d0208-228e-4fd3-989b-cc548cecf9cb} + + + {61ae16a0-1ba1-453d-a77c-db86d2be0568} + + + {1c006197-b25b-48e8-833f-2dd59a571b9d} + + + {3acc42ca-4646-462d-bbac-2a07e9eb30be} + + + {46eb8265-dc41-4289-aa7d-c1918e05cf75} + + + {e1301424-0353-47a8-9f5d-2c6f19bdac10} + + + {996fa5e1-cf7e-4b97-a502-edc874ee020d} + + + {4a1f7816-c9b5-4cfc-a4f3-54d094e13520} + + + {629a0d99-8735-4761-b41b-b2a91b1fdffa} + + + {08465b05-7a80-40b5-bbe5-31914fdd6e7e} + + + {280d66b5-3cf2-47b0-b3a9-2e3035267cb0} + + + {b7e800ab-220d-49ce-b083-52fd69f5c0d0} + + + {83290051-5254-49d1-9681-7e075d369f2f} + + + {df0550dd-1947-4a0f-813a-9c52a3c92d30} + + + {7800c160-ebba-47a3-bce5-513c8d59c721} + + + {d245433a-5e44-4984-8bf4-e3eabfd01080} + + + {9d51019b-0714-4c0f-b110-b796b744b3b9} + + + {e07ef1ae-589b-4aba-95d7-828098035aba} + + + {5b1a5bc3-65ad-4493-a29d-009300622f59} + + + {ff4c9104-e49a-4a1a-8072-efd241caf957} + + + {0a601d97-867d-43c6-896a-037d3ccb1b64} + + + {c390ac60-d84b-4ba9-bdf8-d893e3c5a762} + + + {3062daf0-5f1a-4d51-b52d-809b05b5497d} + + + {0f487f99-d651-4965-b2e6-5da1a04b2f43} + + + {c34cd67a-50d6-49a5-bcdd-afaa2ca9acd4} + + + {b5ca06e6-3e8f-4c47-9896-d97976c1b1ba} + + + {99f433de-7c93-48d2-9e94-0e43420b2c09} + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium/libsodium.xml b/builds/msvc/vs2012/libsodium/libsodium.xml new file mode 100644 index 00000000..808ccb9f --- /dev/null +++ b/builds/msvc/vs2012/libsodium/libsodium.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/test/test.props b/builds/msvc/vs2012/test/test.props index f3097cda..ce5e9106 100644 --- a/builds/msvc/vs2012/test/test.props +++ b/builds/msvc/vs2012/test/test.props @@ -8,10 +8,10 @@ - + - $(ProjectDir)..\..\..\..\test\default\;$(ProjectDir)..\..\..\..\test\quirks\;%(AdditionalIncludeDirectories) + $(RepoRoot)test\default\;$(RepoRoot)test\quirks\;%(AdditionalIncludeDirectories) false _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -24,14 +24,8 @@ - - dynamic - - - ltcg - - - static + + $(DefaultLinkage) diff --git a/builds/msvc/vs2012/test/test.vcxproj b/builds/msvc/vs2012/test/test.vcxproj index 87ba9a4b..574cda97 100644 --- a/builds/msvc/vs2012/test/test.vcxproj +++ b/builds/msvc/vs2012/test/test.vcxproj @@ -1,88 +1,11 @@  - + {4EDBA07C-2F08-4C9E-805F-A4921814C117} test - test11 - - v110 Application - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DebugDEXE @@ -133,6 +56,68 @@ x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false @@ -159,11 +144,9 @@ true - true - true @@ -208,6 +191,9 @@ true + + true + true @@ -242,16 +228,17 @@ true - true - true true + + true + true diff --git a/builds/msvc/vs2012/test/test.vcxproj.filters b/builds/msvc/vs2012/test/test.vcxproj.filters index e959e04d..a0f3fd7d 100644 --- a/builds/msvc/vs2012/test/test.vcxproj.filters +++ b/builds/msvc/vs2012/test/test.vcxproj.filters @@ -142,6 +142,12 @@ src + + src + + + src + diff --git a/builds/msvc/vs2013/libsodium.import.props b/builds/msvc/vs2013/libsodium.import.props index dc854609..550d43ec 100644 --- a/builds/msvc/vs2013/libsodium.import.props +++ b/builds/msvc/vs2013/libsodium.import.props @@ -15,60 +15,32 @@ - $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + $(SourceRoot)libsodium\src\libsodium\include;$(SourceRoot)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) + + advapi32.lib;crypt32.lib;%(AdditionalDependencies) + $(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.lib;%(AdditionalDependencies) - - - - - + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.props b/builds/msvc/vs2013/libsodium/libsodium.props index bcb9b80b..7e9bca4f 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.props +++ b/builds/msvc/vs2013/libsodium/libsodium.props @@ -6,27 +6,38 @@ AllRules.ruleset false + + + + + + - copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\ + copy $(BuildRoot)version.h $(RepoRoot)src\libsodium\include\sodium\ - $(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + $(RepoRoot)src\libsodium\include;$(RepoRoot)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) + HAVE_AMD64_ASM;%(PreprocessorDefinitions) - + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index 5d346782..eff00e8a 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -3,7 +3,7 @@ {A185B162-6CB6-4502-B03F-B56F7699A8D9} libsodium - libsodium12 + v120 @@ -55,9 +55,6 @@ x64 - - v120 - DynamicLibrary @@ -93,142 +90,214 @@ StaticLibrary - + - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + - - - + + + + - - + + + - - - + - + + + - - + + - + + - + + + + + + + + + + + @@ -245,64 +314,94 @@ + + + + + - + + + + + - + + + + + + - + + + + + + + - + + + + - + + + + + + + - + + - - - - + + - - - + + - + + + + @@ -311,12 +410,13 @@ - - - + + + + @@ -329,4 +429,4 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters index d8a14326..9af69a14 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters @@ -1,404 +1,776 @@  - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - 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 - - - resource - include + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + include\sodium + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_auth\hmacsha256 + + + src\crypto_auth\hmacsha512256 + + + src\crypto_onetimeauth\poly1305\donna + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_generichash\blake2\ref + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_box\curve25519xsalsa20poly1305 + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_core\hsalsa20\ref2 + + + src\crypto_core\hsalsa20 + + + src\crypto_core\salsa20\ref + + + src\crypto_core\salsa20 + + + src\crypto_core\salsa208\ref + + + src\crypto_core\salsa208 + + + src\crypto_core\salsa2012 + + + src\crypto_core\salsa2012 + + + src\crypto_auth + + + src\crypto_box + + + src\crypto_generichash + + + src\crypto_hash + + + src\crypto_onetimeauth + + + src\crypto_scalarmult + + + src\crypto_secretbox + + + src\crypto_shorthash + + + src\crypto_sign + + + src\crypto_stream + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_generichash\blake2 + + + src\crypto_generichash\blake2\ref + + + src\crypto_hash\sha256 + + + src\crypto_hash\sha512 + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_onetimeauth\poly1305 + + + src\crypto_onetimeauth\poly1305 + + + src\crypto_onetimeauth\poly1305 + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_scalarmult\curve25519 + + + src\crypto_secretbox\xsalsa20poly1305 + + + src\crypto_shorthash\siphash24\ref + + + src\crypto_shorthash\siphash24 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_sign\edwards25519sha512batch + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes128ctr + + + src\crypto_stream\aes256estream + + + src\crypto_stream\salsa20 + + + src\crypto_stream\salsa208\ref + + + src\crypto_stream\salsa208 + + + src\crypto_stream\salsa2012\ref + + + src\crypto_stream\salsa2012 + + + src\crypto_stream\xsalsa20\ref + + + src\crypto_stream\xsalsa20 + + + src\crypto_onetimeauth\poly1305\donna + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\salsa208\ref + + + src\crypto_stream\salsa2012\ref + + + src\crypto_stream\xsalsa20\ref + + + src\crypto_box + + + src\crypto_secretbox + + + src\crypto_hash\sha256\cp + + + src\crypto_auth\hmacsha256\cp + + + src\crypto_auth\hmacsha256\cp + + + src\crypto_hash\sha512\cp + + + src\crypto_auth\hmacsha512\cp + + + src\crypto_auth\hmacsha512256\cp + + + src\crypto_auth\hmacsha512256\cp + + + src\sodium + + + src\sodium + + + src\sodium + + + src\sodium + + + src\randombytes + + + src\crypto_verify\16 + + + src\crypto_verify\32 + + + src\crypto_verify\64 + + + src\crypto_verify\64\ref + + + src\crypto_verify\32\ref + + + src\crypto_verify\16\ref + + + src\randombytes\salsa20 + + + src\randombytes\sysrandom + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_auth\hmacsha512 + + + src\crypto_generichash\blake2\ref + + + src\crypto_generichash\blake2\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_auth\hmacsha512\cp + + + src\crypto_secretbox\xsalsa20poly1305\ref + + + src\sodium + + + src\crypto_pwhash\scryptxsalsa208sha256 + + + src\crypto_pwhash\scryptxsalsa208sha256\nosse + + + src\crypto_pwhash\scryptxsalsa208sha256\sse + + + src\crypto_auth\hmacsha512256\cp + + + src\crypto_box\curve25519xsalsa20poly1305\ref + + + src\crypto_generichash\blake2\ref + + + src\crypto_hash\sha256\cp + + + src\crypto_hash\sha512\cp + + + src\crypto_onetimeauth\poly1305\donna + + + src\crypto_secretbox\xsalsa20poly1305\ref + + + src\crypto_shorthash\siphash24\ref + + + src\crypto_sign\edwards25519sha512batch\ref + + + src\crypto_stream\aes128ctr\portable + + + src\crypto_stream\aes256estream\hongjun + + + src\crypto_verify\16\ref + + + src\crypto_verify\32\ref + + + src\crypto_verify\64\ref + + + src\crypto_scalarmult\curve25519\donna_c64 + + + src\crypto_scalarmult\curve25519\donna_c64 + + + src\crypto_scalarmult\curve25519\ref + + + src\crypto_scalarmult\curve25519\ref + + + src\crypto_stream\salsa20\ref + + + src\crypto_stream\salsa20\ref + + + src\crypto_core\salsa20\ref + + + src\crypto_core\salsa208\ref + + + src\crypto_core\salsa2012\ref + + + src\crypto_core\hsalsa20\ref2 + + + src\crypto_stream\salsa208\ref + + + src\crypto_stream\salsa2012\ref + + + src\crypto_stream\xsalsa20\ref + + + src\crypto_scalarmult\curve25519\donna_c64 + + + src\crypto_scalarmult\curve25519\ref + + + src\crypto_stream\salsa20\ref + + + src\crypto_stream\salsa20\amd64_xmm6 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_sign\ed25519\ref10 + + + src\crypto_auth\hmacsha256\cp + + + src\crypto_auth\hmacsha512\cp + + + + + resource + + + resource + @@ -416,6 +788,12 @@ packaging + + packaging + + + src\crypto_stream\salsa20\amd64_xmm6 + @@ -424,21 +802,236 @@ {ddaca9ce-4d7d-4395-bfd2-2eda05bc80c2} + + {C7DE5B24-B5D1-47D0-A83A-8C9A123D782C} + {b320f6a3-36a4-4b22-8c21-da7d2e12211a} {983480f9-7320-4c01-b926-ee8dead5b916} - - - - packaging - - - - - resource - + + {02bdfd8e-f5c5-4574-bbbb-c74529732ce6} + + + {a71cc7f9-91b7-4e8f-af53-6ffb34361504} + + + {e0e40095-6fcc-4d17-892c-59dbde8eecef} + + + {2a770536-f29b-4ec2-9abe-8e197f6568d3} + + + {61deff4c-da3d-4818-be86-f303cafafdf7} + + + {d7a19b71-c3e8-4269-9196-b84b75f80ea3} + + + {a355e921-720c-400f-baa6-1ad7c92b0965} + + + {8ec29d92-3133-45d3-918b-ec83736d8fad} + + + {accf7bea-bb27-42b6-94ab-a61c5d33d2a8} + + + {5b07228e-b709-44ed-a064-f955f12346b0} + + + {7d8294db-7351-4e51-8eaf-2c5cf480babb} + + + {9646b8af-9356-4554-901a-01d788977c8f} + + + {51474f49-0245-4469-ad60-1232b070f485} + + + {076ae5b6-e83f-4dfd-8ad1-1cf9498163cf} + + + {561681e2-2540-4d96-beab-1ab5d4c917c1} + + + {120ddd61-6cd1-4942-98c4-d6f0d935561d} + + + {e368d8fe-75aa-4ae4-9108-44d7d2d6dd45} + + + {9c9ccf6a-9ddc-474f-b037-7283a2062441} + + + {a1d49972-da2e-4287-a896-3895b07b8bb6} + + + {d57353dc-ff60-4ff7-95e1-76413f5b7412} + + + {abbfd1ef-8471-4249-a8ba-2127e6ec0d3e} + + + {b6607f53-b7ec-4e2f-b3be-005ec71ebbc8} + + + {2382394d-2013-4992-a192-925667930038} + + + {e3443408-7481-46b8-b7d1-b0934db097af} + + + {7b3b0e11-3a29-4041-8ff3-b2db3515a7ea} + + + {7b85001b-afbc-47ef-b9bc-2e88d42706b9} + + + {84e229c4-90ec-44ff-bc45-4f3124d1a76a} + + + {38f6b495-9ac2-466f-a5f5-6f167c962782} + + + {6e16e561-ad11-4163-b7f5-0f54e5a6be21} + + + {defadbf0-a430-4113-b592-5bb8ccfb3db8} + + + {0ee43c44-b79e-407c-a81b-87e087125c2a} + + + {7d028278-1392-4552-94ab-3b6ddc7d6244} + + + {e82bcfa5-052a-44af-a842-103f82afb038} + + + {8974bffa-329d-4c43-a335-1ef524931734} + + + {b788850f-cd6a-49bb-a2fc-5dc217fb21a3} + + + {4dd0cec6-9024-4ca9-ad9f-e877e0aa4e39} + + + {bcf30ce5-e8cc-4c02-9411-1a493f7d0d2d} + + + {f2d8043a-ea27-4c13-abae-12dfacbf9b2f} + + + {72eb89ac-4a14-4edb-8e0f-2e7f83de9ee3} + + + {b4a8182e-ac68-44ff-9326-4cc0a9061ed8} + + + {229af36f-3c18-4cbf-8b60-84a04be8506e} + + + {ca40b775-e025-4359-87ae-02c771c1a222} + + + {afb86556-101b-407c-93f6-db784a9e3f4f} + + + {91c31952-2f36-418e-aa07-68ed57057d0f} + + + {6aaac1e4-ac4e-4ffb-8bbc-7eb2a7882720} + + + {a4f08471-9539-4f8c-af00-b94d0755bd68} + + + {8d2310cb-954e-4a9e-83bc-89258c241470} + + + {088d0208-228e-4fd3-989b-cc548cecf9cb} + + + {61ae16a0-1ba1-453d-a77c-db86d2be0568} + + + {1c006197-b25b-48e8-833f-2dd59a571b9d} + + + {3acc42ca-4646-462d-bbac-2a07e9eb30be} + + + {46eb8265-dc41-4289-aa7d-c1918e05cf75} + + + {e1301424-0353-47a8-9f5d-2c6f19bdac10} + + + {996fa5e1-cf7e-4b97-a502-edc874ee020d} + + + {4a1f7816-c9b5-4cfc-a4f3-54d094e13520} + + + {629a0d99-8735-4761-b41b-b2a91b1fdffa} + + + {08465b05-7a80-40b5-bbe5-31914fdd6e7e} + + + {280d66b5-3cf2-47b0-b3a9-2e3035267cb0} + + + {b7e800ab-220d-49ce-b083-52fd69f5c0d0} + + + {83290051-5254-49d1-9681-7e075d369f2f} + + + {df0550dd-1947-4a0f-813a-9c52a3c92d30} + + + {7800c160-ebba-47a3-bce5-513c8d59c721} + + + {d245433a-5e44-4984-8bf4-e3eabfd01080} + + + {9d51019b-0714-4c0f-b110-b796b744b3b9} + + + {e07ef1ae-589b-4aba-95d7-828098035aba} + + + {5b1a5bc3-65ad-4493-a29d-009300622f59} + + + {ff4c9104-e49a-4a1a-8072-efd241caf957} + + + {0a601d97-867d-43c6-896a-037d3ccb1b64} + + + {c390ac60-d84b-4ba9-bdf8-d893e3c5a762} + + + {3062daf0-5f1a-4d51-b52d-809b05b5497d} + + + {0f487f99-d651-4965-b2e6-5da1a04b2f43} + + + {c34cd67a-50d6-49a5-bcdd-afaa2ca9acd4} + + + {b5ca06e6-3e8f-4c47-9896-d97976c1b1ba} + + + {99f433de-7c93-48d2-9e94-0e43420b2c09} + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.xml b/builds/msvc/vs2013/libsodium/libsodium.xml new file mode 100644 index 00000000..808ccb9f --- /dev/null +++ b/builds/msvc/vs2013/libsodium/libsodium.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/test/test.props b/builds/msvc/vs2013/test/test.props index f3097cda..ce5e9106 100644 --- a/builds/msvc/vs2013/test/test.props +++ b/builds/msvc/vs2013/test/test.props @@ -8,10 +8,10 @@ - + - $(ProjectDir)..\..\..\..\test\default\;$(ProjectDir)..\..\..\..\test\quirks\;%(AdditionalIncludeDirectories) + $(RepoRoot)test\default\;$(RepoRoot)test\quirks\;%(AdditionalIncludeDirectories) false _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -24,14 +24,8 @@ - - dynamic - - - ltcg - - - static + + $(DefaultLinkage) diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj index e3db2a0d..7cfe1b5b 100644 --- a/builds/msvc/vs2013/test/test.vcxproj +++ b/builds/msvc/vs2013/test/test.vcxproj @@ -3,86 +3,9 @@ {4EDBA07C-2F08-4C9E-805F-A4921814C117} test - test12 - - v120 Application - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DebugDEXE @@ -133,6 +56,68 @@ x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false @@ -159,11 +144,9 @@ true - true - true @@ -208,6 +191,9 @@ true + + true + true @@ -242,16 +228,17 @@ true - true - true true + + true + true diff --git a/builds/msvc/vs2013/test/test.vcxproj.filters b/builds/msvc/vs2013/test/test.vcxproj.filters index e959e04d..a0f3fd7d 100644 --- a/builds/msvc/vs2013/test/test.vcxproj.filters +++ b/builds/msvc/vs2013/test/test.vcxproj.filters @@ -142,6 +142,12 @@ src + + src + + + src + diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config index 832a5f93..012a55f1 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.gsl b/packaging/nuget/package.gsl index 43d12d9e..0295d306 100644 --- a/packaging/nuget/package.gsl +++ b/packaging/nuget/package.gsl @@ -35,118 +35,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + - - + + - - - - - - - - - - + + - - + + - - + + + + + + + + + + - - + + - - - - - - - - - - + + - - + + - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + - - + + - - - - - - - - - - + + - - + + - - + + + + + + + + + + - - + + - - - - - - - - - - + + - - + + - - + + + + + + + + + + - libsodium-x86-v120-mt-s-0_4_5_2.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-s-0_5_0_0.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-sgd-0_4_5_2.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-sgd-0_5_0_0.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-s-0_4_5_2.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-s-0_5_0_0.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-sgd-0_4_5_2.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-sgd-0_5_0_0.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-s-0_4_5_2.ltcg.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-s-0_5_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-sgd-0_4_5_2.ltcg.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-sgd-0_5_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-s-0_4_5_2.ltcg.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-s-0_5_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-sgd-0_4_5_2.ltcg.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-sgd-0_5_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-0_4_5_2.imp.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-0_5_0_0.imp.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-gd-0_4_5_2.imp.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-gd-0_5_0_0.imp.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-0_4_5_2.imp.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-0_5_0_0.imp.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-gd-0_4_5_2.imp.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-gd-0_5_0_0.imp.lib;%(AdditionalDependencies) @@ -97,26 +98,26 @@ - - + + - - + + - - + + - - + +