rbnacl-libsodium 1.0.2 → 1.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (141) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGES.md +4 -0
  3. data/lib/rbnacl/libsodium/version.rb +1 -1
  4. data/vendor/libsodium/ChangeLog +20 -1
  5. data/vendor/libsodium/Makefile.in +39 -27
  6. data/vendor/libsodium/README.markdown +2 -2
  7. data/vendor/libsodium/THANKS +2 -0
  8. data/vendor/libsodium/aclocal.m4 +36 -33
  9. data/vendor/libsodium/autom4te.cache/output.1 +1118 -841
  10. data/vendor/libsodium/autom4te.cache/output.4 +17517 -0
  11. data/vendor/libsodium/autom4te.cache/requests +760 -531
  12. data/vendor/libsodium/autom4te.cache/traces.1 +13 -14
  13. data/vendor/libsodium/autom4te.cache/traces.4 +2951 -0
  14. data/vendor/libsodium/build-aux/compile +1 -1
  15. data/vendor/libsodium/build-aux/config.guess +13 -160
  16. data/vendor/libsodium/build-aux/config.sub +25 -11
  17. data/vendor/libsodium/build-aux/depcomp +1 -1
  18. data/vendor/libsodium/build-aux/install-sh +170 -196
  19. data/vendor/libsodium/build-aux/ltmain.sh +3459 -2026
  20. data/vendor/libsodium/build-aux/missing +1 -1
  21. data/vendor/libsodium/build-aux/test-driver +12 -3
  22. data/vendor/libsodium/builds/msvc/version.h +2 -2
  23. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj +1 -4
  24. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +3 -8
  25. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj +11 -2
  26. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj.filters +11 -2
  27. data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj +2 -5
  28. data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +3 -8
  29. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj +11 -2
  30. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj.filters +11 -2
  31. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj +1 -4
  32. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +3 -8
  33. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj +11 -2
  34. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj.filters +11 -2
  35. data/vendor/libsodium/builds/msvc/vs2015/libsodium.import.props +52 -0
  36. data/vendor/libsodium/{packaging/nuget/package.xml → builds/msvc/vs2015/libsodium.import.xml} +2 -7
  37. data/vendor/libsodium/builds/msvc/vs2015/libsodium.sln +81 -0
  38. data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.props +43 -0
  39. data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.vcxproj +352 -0
  40. data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters +1073 -0
  41. data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.xml +15 -0
  42. data/vendor/libsodium/builds/msvc/vs2015/test/test.props +43 -0
  43. data/vendor/libsodium/builds/msvc/vs2015/test/test.runner.bat +78 -0
  44. data/vendor/libsodium/builds/msvc/vs2015/test/test.vcxproj +241 -0
  45. data/vendor/libsodium/builds/msvc/vs2015/test/test.vcxproj.filters +189 -0
  46. data/vendor/libsodium/configure +1117 -840
  47. data/vendor/libsodium/configure.ac +4 -4
  48. data/vendor/libsodium/dist-build/Makefile.am +2 -2
  49. data/vendor/libsodium/dist-build/Makefile.in +19 -7
  50. data/vendor/libsodium/dist-build/android-arm.sh +3 -2
  51. data/vendor/libsodium/dist-build/android-armv7-a.sh +4 -0
  52. data/vendor/libsodium/dist-build/android-build.sh +4 -5
  53. data/vendor/libsodium/dist-build/android-mips32.sh +4 -0
  54. data/vendor/libsodium/dist-build/android-x86.sh +3 -2
  55. data/vendor/libsodium/dist-build/emscripten.sh +4 -5
  56. data/vendor/libsodium/dist-build/ios.sh +56 -25
  57. data/vendor/libsodium/dist-build/osx.sh +20 -0
  58. data/vendor/libsodium/libsodium.vcxproj +1 -0
  59. data/vendor/libsodium/libsodium.vcxproj.filters +3 -0
  60. data/vendor/libsodium/m4/libtool.m4 +1366 -1030
  61. data/vendor/libsodium/m4/ltoptions.m4 +90 -37
  62. data/vendor/libsodium/m4/ltsugar.m4 +4 -3
  63. data/vendor/libsodium/m4/ltversion.m4 +6 -6
  64. data/vendor/libsodium/m4/lt~obsolete.m4 +4 -3
  65. data/vendor/libsodium/msvc-scripts/Makefile.in +17 -5
  66. data/vendor/libsodium/msvc-scripts/process.bat +2 -2
  67. data/vendor/libsodium/packaging/nuget/package.config +1 -1
  68. data/vendor/libsodium/src/Makefile.in +17 -5
  69. data/vendor/libsodium/src/libsodium/Makefile.am +7 -2
  70. data/vendor/libsodium/src/libsodium/Makefile.in +83 -55
  71. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/auth_hmacsha256_api.c +5 -0
  72. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/cp/verify_hmacsha256.c +1 -1
  73. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512_api.c +5 -0
  74. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/cp/verify_hmacsha512.c +1 -1
  75. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/auth_hmacsha512256_api.c +5 -0
  76. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c +1 -1
  77. data/vendor/libsodium/src/libsodium/crypto_box/crypto_box_seal.c +67 -0
  78. data/vendor/libsodium/src/libsodium/crypto_generichash/crypto_generichash.c +8 -1
  79. data/vendor/libsodium/src/libsodium/crypto_hash/sha256/hash_sha256_api.c +5 -0
  80. data/vendor/libsodium/src/libsodium/crypto_hash/sha512/hash_sha512_api.c +5 -0
  81. data/vendor/libsodium/src/libsodium/crypto_onetimeauth/crypto_onetimeauth.c +12 -6
  82. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h +11 -0
  83. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c +60 -25
  84. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c +12 -12
  85. data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult_curve25519_donna_c64.c +11 -3
  86. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c +1 -1
  87. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c +1 -4
  88. data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/ref/api.h +1 -0
  89. data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c +13 -3
  90. data/vendor/libsodium/src/libsodium/include/Makefile.in +18 -6
  91. data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha256.h +9 -5
  92. data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha512.h +9 -5
  93. data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +6 -2
  94. data/vendor/libsodium/src/libsodium/include/sodium/crypto_box.h +15 -0
  95. data/vendor/libsodium/src/libsodium/include/sodium/crypto_generichash.h +2 -0
  96. data/vendor/libsodium/src/libsodium/include/sodium/crypto_generichash_blake2b.h +1 -1
  97. data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash_sha256.h +2 -0
  98. data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash_sha512.h +2 -0
  99. data/vendor/libsodium/src/libsodium/include/sodium/crypto_onetimeauth.h +2 -0
  100. data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_xsalsa20.h +6 -0
  101. data/vendor/libsodium/src/libsodium/include/sodium/randombytes.h +6 -6
  102. data/vendor/libsodium/src/libsodium/include/sodium/utils.h +2 -2
  103. data/vendor/libsodium/src/libsodium/randombytes/randombytes.c +82 -3
  104. data/vendor/libsodium/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c +85 -33
  105. data/vendor/libsodium/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c +80 -42
  106. data/vendor/libsodium/src/libsodium/sodium/utils.c +16 -13
  107. data/vendor/libsodium/test/Makefile.am +1 -1
  108. data/vendor/libsodium/test/Makefile.in +18 -6
  109. data/vendor/libsodium/test/default/Makefile.am +9 -3
  110. data/vendor/libsodium/test/default/Makefile.in +72 -38
  111. data/vendor/libsodium/test/default/auth.c +8 -0
  112. data/vendor/libsodium/test/default/auth5.c +0 -2
  113. data/vendor/libsodium/test/default/auth7.c +0 -2
  114. data/vendor/libsodium/test/default/box8.c +0 -2
  115. data/vendor/libsodium/test/default/box_easy2.c +1 -1
  116. data/vendor/libsodium/test/default/box_seal.c +43 -0
  117. data/vendor/libsodium/test/default/box_seal.exp +4 -0
  118. data/vendor/libsodium/test/default/cmptest.h +1 -0
  119. data/vendor/libsodium/test/default/generichash2.c +1 -0
  120. data/vendor/libsodium/test/default/hash.c +2 -0
  121. data/vendor/libsodium/test/default/onetimeauth.c +1 -0
  122. data/vendor/libsodium/test/default/onetimeauth7.c +0 -2
  123. data/vendor/libsodium/test/default/pre.js.inc +0 -27
  124. data/vendor/libsodium/test/default/pwhash.c +18 -5
  125. data/vendor/libsodium/test/default/randombytes.c +44 -2
  126. data/vendor/libsodium/test/default/secretbox8.c +0 -2
  127. data/vendor/libsodium/test/default/sodium_utils2.c +5 -1
  128. data/vendor/libsodium/test/default/sodium_utils3.c +1 -1
  129. data/vendor/libsodium/test/default/stream.c +13 -1
  130. data/vendor/libsodium/test/default/stream.exp +1 -0
  131. data/vendor/libsodium/test/default/stream2.c +13 -1
  132. data/vendor/libsodium/test/default/stream2.exp +1 -0
  133. data/vendor/libsodium/test/quirks/quirks.h +26 -0
  134. metadata +23 -12
  135. data/vendor/libsodium/builds/msvc/resource.h +0 -0
  136. data/vendor/libsodium/builds/msvc/resource.rc +0 -0
  137. data/vendor/libsodium/dist-build/android-armv7.sh +0 -3
  138. data/vendor/libsodium/dist-build/android-mips.sh +0 -3
  139. data/vendor/libsodium/packaging/nuget/package.nuspec +0 -95
  140. data/vendor/libsodium/packaging/nuget/package.targets +0 -128
  141. data/vendor/libsodium/test/quirks/windows/windows-quirks.h +0 -18
data/vendor/libsodium/build-aux/missing CHANGED
@@ -3,7 +3,7 @@
3
3
 
4
4
  scriptversion=2013-10-28.13; # UTC
5
5
 
6
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
6
+ # Copyright (C) 1996-2014 Free Software Foundation, Inc.
7
7
  # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
8
8
 
9
9
  # This program is free software; you can redistribute it and/or modify
data/vendor/libsodium/build-aux/test-driver CHANGED
@@ -3,7 +3,7 @@
3
3
 
4
4
  scriptversion=2013-07-13.22; # UTC
5
5
 
6
- # Copyright (C) 2011-2013 Free Software Foundation, Inc.
6
+ # Copyright (C) 2011-2014 Free Software Foundation, Inc.
7
7
  #
8
8
  # This program is free software; you can redistribute it and/or modify
9
9
  # it under the terms of the GNU General Public License as published by
@@ -106,11 +106,14 @@ trap "st=143; $do_exit" 15
106
106
  # Test script is run here.
107
107
  "$@" >$log_file 2>&1
108
108
  estatus=$?
109
+
109
110
  if test $enable_hard_errors = no && test $estatus -eq 99; then
110
- estatus=1
111
+ tweaked_estatus=1
112
+ else
113
+ tweaked_estatus=$estatus
111
114
  fi
112
115
 
113
- case $estatus:$expect_failure in
116
+ case $tweaked_estatus:$expect_failure in
114
117
  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
115
118
  0:*) col=$grn res=PASS recheck=no gcopy=no;;
116
119
  77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
@@ -119,6 +122,12 @@ case $estatus:$expect_failure in
119
122
  *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
120
123
  esac
121
124
 
125
+ # Report the test outcome and exit status in the logs, so that one can
126
+ # know whether the test passed or failed simply by looking at the '.log'
127
+ # file, without the need of also peaking into the corresponding '.trs'
128
+ # file (automake bug#11814).
129
+ echo "$res $test_name (exit status: $estatus)" >>$log_file
130
+
122
131
  # Report outcome to console.
123
132
  echo "${col}${res}${std}: $test_name"
124
133
 
data/vendor/libsodium/builds/msvc/version.h CHANGED
@@ -4,10 +4,10 @@
4
4
 
5
5
  #include "export.h"
6
6
 
7
- #define SODIUM_VERSION_STRING "1.0.2"
7
+ #define SODIUM_VERSION_STRING "1.0.3"
8
8
 
9
9
  #define SODIUM_LIBRARY_VERSION_MAJOR 7
10
- #define SODIUM_LIBRARY_VERSION_MINOR 4
10
+ #define SODIUM_LIBRARY_VERSION_MINOR 5
11
11
 
12
12
  #ifdef __cplusplus
13
13
  extern "C" {
data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj CHANGED
@@ -163,6 +163,7 @@
163
163
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c" />
164
164
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box.c" />
165
165
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c" />
166
+ <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_seal.c" />
166
167
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c" />
167
168
  <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h" />
168
169
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c" />
@@ -333,14 +334,10 @@
333
334
  <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />
334
335
  <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />
335
336
  <ClCompile Include="..\..\..\..\src\libsodium\sodium\version.c" />
336
- <ClInclude Include="..\..\resource.h" />
337
337
  </ItemGroup>
338
338
  <ItemGroup>
339
339
  <None Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\stream_salsa20_amd64_xmm6.S" />
340
340
  </ItemGroup>
341
- <ItemGroup>
342
- <ResourceCompile Include="..\..\resource.rc" />
343
- </ItemGroup>
344
341
  <ItemGroup>
345
342
  <None Include="..\..\..\..\packaging\nuget\package.bat" />
346
343
  <None Include="..\..\..\..\packaging\nuget\package.config" />
data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters CHANGED
@@ -460,6 +460,9 @@
460
460
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c">
461
461
  <Filter>src\crypto_box</Filter>
462
462
  </ClCompile>
463
+ <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_seal.c">
464
+ <Filter>src\crypto_box</Filter>
465
+ </ClCompile>
463
466
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\crypto_secretbox_easy.c">
464
467
  <Filter>src\crypto_secretbox</Filter>
465
468
  </ClCompile>
@@ -743,14 +746,6 @@
743
746
  <Filter>include\sodium</Filter>
744
747
  </ClInclude>
745
748
  </ItemGroup>
746
- <ItemGroup>
747
- <ClInclude Include="..\..\resource.h">
748
- <Filter>resource</Filter>
749
- </ClInclude>
750
- <ResourceCompile Include="..\..\resource.rc">
751
- <Filter>resource</Filter>
752
- </ResourceCompile>
753
- </ItemGroup>
754
749
  <ItemGroup>
755
750
  <None Include="..\..\..\..\packaging\nuget\package.bat">
756
751
  <Filter>packaging</Filter>
data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj CHANGED
@@ -103,6 +103,12 @@
103
103
  <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
104
104
  <ExcludedFromBuild>true</ExcludedFromBuild>
105
105
  </ClCompile>
106
+ <ClCompile Include="..\..\..\..\test\default\box_seal.c">
107
+ <ExcludedFromBuild>true</ExcludedFromBuild>
108
+ </ClCompile>
109
+ <ClCompile Include="..\..\..\..\test\default\box_seed.c">
110
+ <ExcludedFromBuild>true</ExcludedFromBuild>
111
+ </ClCompile>
106
112
  <ClCompile Include="..\..\..\..\test\default\core1.c">
107
113
  <ExcludedFromBuild>true</ExcludedFromBuild>
108
114
  </ClCompile>
@@ -151,6 +157,9 @@
151
157
  <ClCompile Include="..\..\..\..\test\default\pwhash.c">
152
158
  <ExcludedFromBuild>true</ExcludedFromBuild>
153
159
  </ClCompile>
160
+ <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c">
161
+ <ExcludedFromBuild>true</ExcludedFromBuild>
162
+ </ClCompile>
154
163
  <ClCompile Include="..\..\..\..\test\default\randombytes.c">
155
164
  <ExcludedFromBuild>true</ExcludedFromBuild>
156
165
  </ClCompile>
@@ -226,7 +235,7 @@
226
235
  </ItemGroup>
227
236
  <ItemGroup>
228
237
  <ClInclude Include="..\..\..\..\test\default\cmptest.h" />
229
- <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h" />
238
+ <ClInclude Include="..\..\..\..\test\quirks\quirks.h" />
230
239
  </ItemGroup>
231
240
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
232
- </Project>
241
+ </Project>
data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj.filters CHANGED
@@ -22,6 +22,12 @@
22
22
  <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
23
23
  <Filter>src</Filter>
24
24
  </ClCompile>
25
+ <ClCompile Include="..\..\..\..\test\default\box_seal.c">
26
+ <Filter>src</Filter>
27
+ </ClCompile>
28
+ <ClCompile Include="..\..\..\..\test\default\box_seed.c">
29
+ <Filter>src</Filter>
30
+ </ClCompile>
25
31
  <ClCompile Include="..\..\..\..\test\default\box2.c">
26
32
  <Filter>src</Filter>
27
33
  </ClCompile>
@@ -76,6 +82,9 @@
76
82
  <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c">
77
83
  <Filter>src</Filter>
78
84
  </ClCompile>
85
+ <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c">
86
+ <Filter>src</Filter>
87
+ </ClCompile>
79
88
  <ClCompile Include="..\..\..\..\test\default\randombytes.c">
80
89
  <Filter>src</Filter>
81
90
  </ClCompile>
@@ -165,7 +174,7 @@
165
174
  <ClInclude Include="..\..\..\..\test\default\cmptest.h">
166
175
  <Filter>include</Filter>
167
176
  </ClInclude>
168
- <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h">
177
+ <ClInclude Include="..\..\..\..\test\quirks\quirks.h">
169
178
  <Filter>include</Filter>
170
179
  </ClInclude>
171
180
  </ItemGroup>
@@ -177,4 +186,4 @@
177
186
  <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
178
187
  </Filter>
179
188
  </ItemGroup>
180
- </Project>
189
+ </Project>
data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj CHANGED
@@ -1,5 +1,5 @@
1
1
  <?xml version="1.0" encoding="utf-8"?>
2
- <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+ <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
3
  <PropertyGroup Label="Globals">
4
4
  <ProjectGuid>{A185B162-6CB6-4502-B03F-B56F7699A8D9}</ProjectGuid>
5
5
  <ProjectName>libsodium</ProjectName>
@@ -163,6 +163,7 @@
163
163
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c" />
164
164
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box.c" />
165
165
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c" />
166
+ <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_seal.c" />
166
167
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c" />
167
168
  <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h" />
168
169
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c" />
@@ -333,14 +334,10 @@
333
334
  <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />
334
335
  <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />
335
336
  <ClCompile Include="..\..\..\..\src\libsodium\sodium\version.c" />
336
- <ClInclude Include="..\..\resource.h" />
337
337
  </ItemGroup>
338
338
  <ItemGroup>
339
339
  <None Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\stream_salsa20_amd64_xmm6.S" />
340
340
  </ItemGroup>
341
- <ItemGroup>
342
- <ResourceCompile Include="..\..\resource.rc" />
343
- </ItemGroup>
344
341
  <ItemGroup>
345
342
  <None Include="..\..\..\..\packaging\nuget\package.bat" />
346
343
  <None Include="..\..\..\..\packaging\nuget\package.config" />
data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters CHANGED
@@ -460,6 +460,9 @@
460
460
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c">
461
461
  <Filter>src\crypto_box</Filter>
462
462
  </ClCompile>
463
+ <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_seal.c">
464
+ <Filter>src\crypto_box</Filter>
465
+ </ClCompile>
463
466
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\crypto_secretbox_easy.c">
464
467
  <Filter>src\crypto_secretbox</Filter>
465
468
  </ClCompile>
@@ -743,14 +746,6 @@
743
746
  <Filter>include\sodium</Filter>
744
747
  </ClInclude>
745
748
  </ItemGroup>
746
- <ItemGroup>
747
- <ClInclude Include="..\..\resource.h">
748
- <Filter>resource</Filter>
749
- </ClInclude>
750
- <ResourceCompile Include="..\..\resource.rc">
751
- <Filter>resource</Filter>
752
- </ResourceCompile>
753
- </ItemGroup>
754
749
  <ItemGroup>
755
750
  <None Include="..\..\..\..\packaging\nuget\package.bat">
756
751
  <Filter>packaging</Filter>
data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj CHANGED
@@ -103,6 +103,12 @@
103
103
  <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
104
104
  <ExcludedFromBuild>true</ExcludedFromBuild>
105
105
  </ClCompile>
106
+ <ClCompile Include="..\..\..\..\test\default\box_seal.c">
107
+ <ExcludedFromBuild>true</ExcludedFromBuild>
108
+ </ClCompile>
109
+ <ClCompile Include="..\..\..\..\test\default\box_seed.c">
110
+ <ExcludedFromBuild>true</ExcludedFromBuild>
111
+ </ClCompile>
106
112
  <ClCompile Include="..\..\..\..\test\default\core1.c">
107
113
  <ExcludedFromBuild>true</ExcludedFromBuild>
108
114
  </ClCompile>
@@ -151,6 +157,9 @@
151
157
  <ClCompile Include="..\..\..\..\test\default\pwhash.c">
152
158
  <ExcludedFromBuild>true</ExcludedFromBuild>
153
159
  </ClCompile>
160
+ <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c">
161
+ <ExcludedFromBuild>true</ExcludedFromBuild>
162
+ </ClCompile>
154
163
  <ClCompile Include="..\..\..\..\test\default\randombytes.c">
155
164
  <ExcludedFromBuild>true</ExcludedFromBuild>
156
165
  </ClCompile>
@@ -226,7 +235,7 @@
226
235
  </ItemGroup>
227
236
  <ItemGroup>
228
237
  <ClInclude Include="..\..\..\..\test\default\cmptest.h" />
229
- <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h" />
238
+ <ClInclude Include="..\..\..\..\test\quirks\quirks.h" />
230
239
  </ItemGroup>
231
240
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
232
- </Project>
241
+ </Project>
data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj.filters CHANGED
@@ -22,6 +22,12 @@
22
22
  <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
23
23
  <Filter>src</Filter>
24
24
  </ClCompile>
25
+ <ClCompile Include="..\..\..\..\test\default\box_seal.c">
26
+ <Filter>src</Filter>
27
+ </ClCompile>
28
+ <ClCompile Include="..\..\..\..\test\default\box_seed.c">
29
+ <Filter>src</Filter>
30
+ </ClCompile>
25
31
  <ClCompile Include="..\..\..\..\test\default\box2.c">
26
32
  <Filter>src</Filter>
27
33
  </ClCompile>
@@ -76,6 +82,9 @@
76
82
  <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c">
77
83
  <Filter>src</Filter>
78
84
  </ClCompile>
85
+ <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c">
86
+ <Filter>src</Filter>
87
+ </ClCompile>
79
88
  <ClCompile Include="..\..\..\..\test\default\randombytes.c">
80
89
  <Filter>src</Filter>
81
90
  </ClCompile>
@@ -165,7 +174,7 @@
165
174
  <ClInclude Include="..\..\..\..\test\default\cmptest.h">
166
175
  <Filter>include</Filter>
167
176
  </ClInclude>
168
- <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h">
177
+ <ClInclude Include="..\..\..\..\test\quirks\quirks.h">
169
178
  <Filter>include</Filter>
170
179
  </ClInclude>
171
180
  </ItemGroup>
@@ -177,4 +186,4 @@
177
186
  <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
178
187
  </Filter>
179
188
  </ItemGroup>
180
- </Project>
189
+ </Project>
data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj CHANGED
@@ -163,6 +163,7 @@
163
163
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c" />
164
164
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box.c" />
165
165
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c" />
166
+ <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_seal.c" />
166
167
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c" />
167
168
  <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h" />
168
169
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c" />
@@ -333,14 +334,10 @@
333
334
  <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />
334
335
  <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />
335
336
  <ClCompile Include="..\..\..\..\src\libsodium\sodium\version.c" />
336
- <ClInclude Include="..\..\resource.h" />
337
337
  </ItemGroup>
338
338
  <ItemGroup>
339
339
  <None Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\stream_salsa20_amd64_xmm6.S" />
340
340
  </ItemGroup>
341
- <ItemGroup>
342
- <ResourceCompile Include="..\..\resource.rc" />
343
- </ItemGroup>
344
341
  <ItemGroup>
345
342
  <None Include="..\..\..\..\packaging\nuget\package.bat" />
346
343
  <None Include="..\..\..\..\packaging\nuget\package.config" />
data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters CHANGED
@@ -460,6 +460,9 @@
460
460
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c">
461
461
  <Filter>src\crypto_box</Filter>
462
462
  </ClCompile>
463
+ <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_seal.c">
464
+ <Filter>src\crypto_box</Filter>
465
+ </ClCompile>
463
466
  <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\crypto_secretbox_easy.c">
464
467
  <Filter>src\crypto_secretbox</Filter>
465
468
  </ClCompile>
@@ -743,14 +746,6 @@
743
746
  <Filter>include\sodium</Filter>
744
747
  </ClInclude>
745
748
  </ItemGroup>
746
- <ItemGroup>
747
- <ClInclude Include="..\..\resource.h">
748
- <Filter>resource</Filter>
749
- </ClInclude>
750
- <ResourceCompile Include="..\..\resource.rc">
751
- <Filter>resource</Filter>
752
- </ResourceCompile>
753
- </ItemGroup>
754
749
  <ItemGroup>
755
750
  <None Include="..\..\..\..\packaging\nuget\package.bat">
756
751
  <Filter>packaging</Filter>
data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj CHANGED
@@ -103,6 +103,12 @@
103
103
  <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
104
104
  <ExcludedFromBuild>true</ExcludedFromBuild>
105
105
  </ClCompile>
106
+ <ClCompile Include="..\..\..\..\test\default\box_seal.c">
107
+ <ExcludedFromBuild>true</ExcludedFromBuild>
108
+ </ClCompile>
109
+ <ClCompile Include="..\..\..\..\test\default\box_seed.c">
110
+ <ExcludedFromBuild>true</ExcludedFromBuild>
111
+ </ClCompile>
106
112
  <ClCompile Include="..\..\..\..\test\default\core1.c">
107
113
  <ExcludedFromBuild>true</ExcludedFromBuild>
108
114
  </ClCompile>
@@ -151,6 +157,9 @@
151
157
  <ClCompile Include="..\..\..\..\test\default\pwhash.c">
152
158
  <ExcludedFromBuild>true</ExcludedFromBuild>
153
159
  </ClCompile>
160
+ <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c">
161
+ <ExcludedFromBuild>true</ExcludedFromBuild>
162
+ </ClCompile>
154
163
  <ClCompile Include="..\..\..\..\test\default\randombytes.c">
155
164
  <ExcludedFromBuild>true</ExcludedFromBuild>
156
165
  </ClCompile>
@@ -226,7 +235,7 @@
226
235
  </ItemGroup>
227
236
  <ItemGroup>
228
237
  <ClInclude Include="..\..\..\..\test\default\cmptest.h" />
229
- <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h" />
238
+ <ClInclude Include="..\..\..\..\test\quirks\quirks.h" />
230
239
  </ItemGroup>
231
240
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
232
- </Project>
241
+ </Project>
data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj.filters CHANGED
@@ -22,6 +22,12 @@
22
22
  <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
23
23
  <Filter>src</Filter>
24
24
  </ClCompile>
25
+ <ClCompile Include="..\..\..\..\test\default\box_seal.c">
26
+ <Filter>src</Filter>
27
+ </ClCompile>
28
+ <ClCompile Include="..\..\..\..\test\default\box_seed.c">
29
+ <Filter>src</Filter>
30
+ </ClCompile>
25
31
  <ClCompile Include="..\..\..\..\test\default\box2.c">
26
32
  <Filter>src</Filter>
27
33
  </ClCompile>
@@ -76,6 +82,9 @@
76
82
  <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c">
77
83
  <Filter>src</Filter>
78
84
  </ClCompile>
85
+ <ClCompile Include="..\..\..\..\test\default\pwhash_scrypt_ll.c">
86
+ <Filter>src</Filter>
87
+ </ClCompile>
79
88
  <ClCompile Include="..\..\..\..\test\default\randombytes.c">
80
89
  <Filter>src</Filter>
81
90
  </ClCompile>
@@ -165,7 +174,7 @@
165
174
  <ClInclude Include="..\..\..\..\test\default\cmptest.h">
166
175
  <Filter>include</Filter>
167
176
  </ClInclude>
168
- <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h">
177
+ <ClInclude Include="..\..\..\..\test\quirks\quirks.h">
169
178
  <Filter>include</Filter>
170
179
  </ClInclude>
171
180
  </ItemGroup>
@@ -177,4 +186,4 @@
177
186
  <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
178
187
  </Filter>
179
188
  </ItemGroup>
180
- </Project>
189
+ </Project>
data/vendor/libsodium/builds/msvc/vs2015/libsodium.import.props ADDED
@@ -0,0 +1,52 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+
4
+ <PropertyGroup Label="Globals">
5
+ <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
6
+ </PropertyGroup>
7
+
8
+ <!-- User Interface -->
9
+
10
+ <ItemGroup Label="BuildOptionsExtension">
11
+ <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
12
+ </ItemGroup>
13
+
14
+ <!-- Linkage -->
15
+
16
+ <ItemDefinitionGroup>
17
+ <ClCompile>
18
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
19
+ <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
20
+ </ClCompile>
21
+ <Link>
22
+ <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
23
+ <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
24
+ <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
25
+ </Link>
26
+ </ItemDefinitionGroup>
27
+
28
+ <!-- Copy -->
29
+
30
+ <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
31
+ <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
32
+ SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
33
+ DestinationFiles="$(TargetDir)libsodium.dll"
34
+ SkipUnchangedFiles="true" />
35
+ <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
36
+ SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
37
+ DestinationFiles="$(TargetDir)libsodium.pdb"
38
+ SkipUnchangedFiles="true" />
39
+ <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
40
+ SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
41
+ DestinationFiles="$(TargetDir)libsodium.dll"
42
+ SkipUnchangedFiles="true" />
43
+ </Target>
44
+
45
+ <!-- Messages -->
46
+
47
+ <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
48
+ <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
49
+ <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
50
+ </Target>
51
+
52
+ </Project>