rbnacl-libsodium 0.6.1 → 0.7.0

data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj.filters

@@ -49,6 +49,9 @@
     <ClCompile Include="..\..\..\..\test\default\core6.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\generichash.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -115,6 +118,12 @@
     <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -159,4 +168,4 @@
       <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>

data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj

@@ -130,7 +130,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h" />
@@ -303,14 +302,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\xor_afternm_aes128ctr.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
@@ -338,7 +329,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\randombytes.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\salsa20\randombytes_salsa20_random.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\sodium\compat.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\sodium\core.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />
@@ -362,4 +352,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>

data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters

@@ -94,9 +94,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h">
-      <Filter>include\sodium</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
@@ -154,9 +151,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c">
       <Filter>src\crypto_box\curve25519xsalsa20poly1305\ref</Filter>
     </ClCompile>
@@ -427,9 +421,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c">
       <Filter>src\crypto_stream\aes128ctr</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c">
-      <Filter>src\crypto_stream\aes256estream</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c">
       <Filter>src\crypto_stream\salsa20</Filter>
     </ClCompile>
@@ -493,9 +484,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c">
       <Filter>src\crypto_auth\hmacsha512256\cp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\sodium\compat.c">
-      <Filter>src\sodium</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\sodium\core.c">
       <Filter>src\sodium</Filter>
     </ClCompile>
@@ -532,18 +520,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c">
       <Filter>src\randombytes\sysrandom</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\auth_hmacsha512_api.c">
       <Filter>src\crypto_auth\hmacsha512</Filter>
     </ClCompile>
@@ -565,9 +541,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\crypto_scrypt-common.c">
       <Filter>src\crypto_pwhash\scryptsalsa208sha256</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
@@ -676,9 +649,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h">
       <Filter>src\crypto_stream\aes128ctr\portable</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\api.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h">
       <Filter>src\crypto_verify\16\ref</Filter>
     </ClInclude>
@@ -946,9 +916,6 @@
     <Filter Include="src\crypto_stream\aes128ctr">
       <UniqueIdentifier>{ca40b775-e025-4359-87ae-02c771c1a222}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\crypto_stream\aes256estream">
-      <UniqueIdentifier>{afb86556-101b-407c-93f6-db784a9e3f4f}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\crypto_stream\salsa20">
       <UniqueIdentifier>{91c31952-2f36-418e-aa07-68ed57057d0f}</UniqueIdentifier>
     </Filter>
@@ -970,9 +937,6 @@
     <Filter Include="src\crypto_stream\salsa2012\ref">
       <UniqueIdentifier>{1c006197-b25b-48e8-833f-2dd59a571b9d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\crypto_stream\aes256estream\hongjun">
-      <UniqueIdentifier>{3acc42ca-4646-462d-bbac-2a07e9eb30be}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\crypto_stream\aes128ctr\portable">
       <UniqueIdentifier>{46eb8265-dc41-4289-aa7d-c1918e05cf75}</UniqueIdentifier>
     </Filter>
@@ -1111,4 +1075,4 @@
       <Filter>src\crypto_aead\chacha20poly1305\sodium</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj

@@ -112,6 +112,9 @@
     <ClCompile Include="..\..\..\..\test\default\core6.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\generichash.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -184,6 +187,12 @@
     <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -211,4 +220,4 @@
     <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>

data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj.filters

@@ -49,6 +49,9 @@
     <ClCompile Include="..\..\..\..\test\default\core6.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\generichash.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -115,6 +118,12 @@
     <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -159,4 +168,4 @@
       <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>

data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj

@@ -130,7 +130,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h" />
@@ -303,14 +302,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\xor_afternm_aes128ctr.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
@@ -338,7 +329,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\randombytes.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\salsa20\randombytes_salsa20_random.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\sodium\compat.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\sodium\core.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />
@@ -362,4 +352,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>

data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters

@@ -94,9 +94,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h">
-      <Filter>include\sodium</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
@@ -154,9 +151,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c">
       <Filter>src\crypto_box\curve25519xsalsa20poly1305\ref</Filter>
     </ClCompile>
@@ -427,9 +421,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c">
       <Filter>src\crypto_stream\aes128ctr</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c">
-      <Filter>src\crypto_stream\aes256estream</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c">
       <Filter>src\crypto_stream\salsa20</Filter>
     </ClCompile>
@@ -493,9 +484,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c">
       <Filter>src\crypto_auth\hmacsha512256\cp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\sodium\compat.c">
-      <Filter>src\sodium</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\sodium\core.c">
       <Filter>src\sodium</Filter>
     </ClCompile>
@@ -532,18 +520,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c">
       <Filter>src\randombytes\sysrandom</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\auth_hmacsha512_api.c">
       <Filter>src\crypto_auth\hmacsha512</Filter>
     </ClCompile>
@@ -565,9 +541,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\crypto_scrypt-common.c">
       <Filter>src\crypto_pwhash\scryptsalsa208sha256</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
@@ -676,9 +649,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h">
       <Filter>src\crypto_stream\aes128ctr\portable</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\api.h">
-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h">
       <Filter>src\crypto_verify\16\ref</Filter>
     </ClInclude>
@@ -946,9 +916,6 @@
     <Filter Include="src\crypto_stream\aes128ctr">
       <UniqueIdentifier>{ca40b775-e025-4359-87ae-02c771c1a222}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\crypto_stream\aes256estream">
-      <UniqueIdentifier>{afb86556-101b-407c-93f6-db784a9e3f4f}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\crypto_stream\salsa20">
       <UniqueIdentifier>{91c31952-2f36-418e-aa07-68ed57057d0f}</UniqueIdentifier>
     </Filter>
@@ -970,9 +937,6 @@
     <Filter Include="src\crypto_stream\salsa2012\ref">
       <UniqueIdentifier>{1c006197-b25b-48e8-833f-2dd59a571b9d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\crypto_stream\aes256estream\hongjun">
-      <UniqueIdentifier>{3acc42ca-4646-462d-bbac-2a07e9eb30be}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\crypto_stream\aes128ctr\portable">
       <UniqueIdentifier>{46eb8265-dc41-4289-aa7d-c1918e05cf75}</UniqueIdentifier>
     </Filter>
@@ -1111,4 +1075,4 @@
       <Filter>src\crypto_aead\chacha20poly1305\sodium</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj

@@ -112,6 +112,9 @@
     <ClCompile Include="..\..\..\..\test\default\core6.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\generichash.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -184,6 +187,12 @@
     <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -211,4 +220,4 @@
     <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>

data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj.filters

@@ -49,6 +49,9 @@
     <ClCompile Include="..\..\..\..\test\default\core6.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\generichash.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -115,6 +118,12 @@
     <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -159,4 +168,4 @@
       <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>

data/vendor/libsodium/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libsodium 0.6.1.
+# Generated by GNU Autoconf 2.69 for libsodium 0.7.0.
 #
 # Report bugs to <https://github.com/jedisct1/libsodium/issues>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libsodium'
 PACKAGE_TARNAME='libsodium'
-PACKAGE_VERSION='0.6.1'
-PACKAGE_STRING='libsodium 0.6.1'
+PACKAGE_VERSION='0.7.0'
+PACKAGE_STRING='libsodium 0.7.0'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
 
@@ -1353,7 +1353,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libsodium 0.6.1 to adapt to many kinds of systems.
+\`configure' configures libsodium 0.7.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1423,7 +1423,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 0.6.1:";;
+     short | recursive ) echo "Configuration of libsodium 0.7.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1550,7 +1550,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 0.6.1
+libsodium configure 0.7.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1919,7 +1919,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libsodium $as_me 0.6.1, which was
+It was created by libsodium $as_me 0.7.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2855,7 +2855,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='0.6.1'
+ VERSION='0.7.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3149,10 +3149,10 @@ fi
 ISODATE=`date +%Y-%m-%d`
 
 
-SODIUM_LIBRARY_VERSION_MAJOR=6
-SODIUM_LIBRARY_VERSION_MINOR=1
-DLL_VERSION=5
-SODIUM_LIBRARY_VERSION=12:0:2
+SODIUM_LIBRARY_VERSION_MAJOR=7
+SODIUM_LIBRARY_VERSION_MINOR=0
+DLL_VERSION=6
+SODIUM_LIBRARY_VERSION=13:0:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -3220,13 +3220,6 @@ $as_echo "$as_me: WARNING: compiling to javascript - asm implementations disable
 
 fi
 
-case $host in #(
-  x86_64-*-mingw* | x86_64-*-cygwin*) :
-    enable_asm="no" ;; #(
-  *) :
-     ;;
-esac
-
 # Check whether --enable-pie was given.
 if test "${enable_pie+set}" = set; then :
   enableval=$enable_pie; enable_pie=$enableval
@@ -3236,7 +3229,7 @@ fi
 
 
 case $host_os in #(
-  mingw*) :
+  mingw*|cygwin*|msys) :
     enable_pie="no" ;; #(
   *) :
      ;;
@@ -5160,7 +5153,12 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fPIC" >&5
+case $host_os in #(
+  cygwin*|mingw*|msys|pw32*|cegcc*) :
+      ;; #(
+  *) :
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fPIC" >&5
 $as_echo_n "checking whether C compiler accepts -fPIC... " >&6; }
 if ${ax_cv_check_cflags___fPIC+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -5191,7 +5189,7 @@ fi
 $as_echo "$ax_cv_check_cflags___fPIC" >&6; }
 if test x"$ax_cv_check_cflags___fPIC" = xyes; then :
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fPIC" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fPIC" >&5
 $as_echo_n "checking whether the linker accepts -fPIC... " >&6; }
 if ${ax_cv_check_ldflags___fPIC+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -5233,6 +5231,8 @@ else
   :
 fi
 
+ ;;
+esac
 
 if test "$enable_pie" != "no"; then :
 
@@ -5470,7 +5470,7 @@ fi
 
 
 case $host_os in #(
-  cygwin* | mingw* | pw32* | cegcc*) :
+  cygwin*|mingw*|msys|pw32*|cegcc*) :
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--dynamicbase" >&5
 $as_echo_n "checking whether the linker accepts -Wl,--dynamicbase... " >&6; }
@@ -5553,7 +5553,7 @@ if test "x$enable_ssp" != "xno"; then :
 
 
 case $host_os in #(
-  cygwin* | mingw* | pw32* | cegcc*) :
+  cygwin*|mingw*|msys|pw32*|cegcc*) :
       ;; #(
   dragonfly*) :
 
@@ -14415,8 +14415,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 HAVE_AMD64_ASM_V=0
 if test "$enable_asm" != "no"; then :
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can assemble basic amd64 code" >&5
-$as_echo_n "checking whether we can assemble basic amd64 code... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we should use x86_64 asm code" >&5
+$as_echo_n "checking whether we should use x86_64 asm code... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14426,9 +14426,12 @@ main ()
 {
 
 #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
+# if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)
+#  error Windows x86_64 calling conventions are not supported yet
+# endif
 /* neat */
 #else
-# error !amd64
+# error !x86_64
 #endif
 __asm__("pxor %xmm12,%xmm6");
 
@@ -14601,109 +14604,6 @@ $as_echo "#define CPU_ALIGNED_ACCESS_REQUIRED 1" >>confdefs.h
 esac
 
 
-ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
-if test "x$ac_cv_func_clock_gettime" = xyes; then :
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if ${ac_cv_lib_rt_clock_gettime+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char clock_gettime ();
-int
-main ()
-{
-return clock_gettime ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_rt_clock_gettime=yes
-else
-  ac_cv_lib_rt_clock_gettime=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRT 1
-_ACEOF
-
-  LIBS="-lrt $LIBS"
-
-fi
-
-fi
-
-ac_fn_c_check_func "$LINENO" "fegetenv" "ac_cv_func_fegetenv"
-if test "x$ac_cv_func_fegetenv" = xyes; then :
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fegetenv in -lm" >&5
-$as_echo_n "checking for fegetenv in -lm... " >&6; }
-if ${ac_cv_lib_m_fegetenv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char fegetenv ();
-int
-main ()
-{
-return fegetenv ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_fegetenv=yes
-else
-  ac_cv_lib_m_fegetenv=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fegetenv" >&5
-$as_echo "$ac_cv_lib_m_fegetenv" >&6; }
-if test "x$ac_cv_lib_m_fegetenv" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
-
-fi
-
-fi
-
-
 if test "x$EMSCRIPTEN" = "x"; then :
 
   for ac_func in arc4random arc4random_buf
@@ -14720,19 +14620,7 @@ done
 
 
 fi
-for ac_func in mlock VirtualLock
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-for ac_func in SecureZeroMemory explicit_bzero posix_memalign
+for ac_func in mlock mprotect explicit_bzero posix_memalign
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -15692,7 +15580,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libsodium $as_me 0.6.1, which was
+This file was extended by libsodium $as_me 0.7.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15750,7 +15638,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libsodium config.status 0.6.1
+libsodium config.status 0.7.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"