rbnacl-libsodium 0.6.0 → 0.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (60) 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 +15 -0
  5. data/vendor/libsodium/Makefile.am +2 -2
  6. data/vendor/libsodium/Makefile.in +6 -8
  7. data/vendor/libsodium/aclocal.m4 +0 -1
  8. data/vendor/libsodium/autom4te.cache/output.1 +47 -158
  9. data/vendor/libsodium/autom4te.cache/output.3 +17354 -0
  10. data/vendor/libsodium/autom4te.cache/requests +321 -92
  11. data/vendor/libsodium/autom4te.cache/traces.1 +371 -390
  12. data/vendor/libsodium/autom4te.cache/traces.3 +2832 -0
  13. data/vendor/libsodium/builds/msvc/properties/Debug.props +1 -1
  14. data/vendor/libsodium/builds/msvc/properties/DebugLIB.props +1 -0
  15. data/vendor/libsodium/builds/msvc/properties/DebugLTCG.props +1 -0
  16. data/vendor/libsodium/builds/msvc/resource.rc +0 -0
  17. data/vendor/libsodium/builds/msvc/version.h +2 -2
  18. data/vendor/libsodium/builds/msvc/vs2010/libsodium.import.props +1 -1
  19. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj +1 -1
  20. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +1 -1
  21. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj +0 -6
  22. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj.filters +0 -6
  23. data/vendor/libsodium/builds/msvc/vs2012/libsodium.import.props +1 -1
  24. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj +0 -6
  25. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj.filters +0 -6
  26. data/vendor/libsodium/builds/msvc/vs2013/libsodium.import.props +1 -1
  27. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj +1 -1
  28. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +1 -1
  29. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj +0 -6
  30. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj.filters +0 -6
  31. data/vendor/libsodium/configure +47 -158
  32. data/vendor/libsodium/configure.ac +18 -7
  33. data/vendor/libsodium/dist-build/Makefile.in +1 -5
  34. data/vendor/libsodium/dist-build/emscripten.sh +4 -3
  35. data/vendor/libsodium/msvc-scripts/Makefile.in +1 -5
  36. data/vendor/libsodium/msvc-scripts/process.bat +2 -2
  37. data/vendor/libsodium/packaging/nuget/package.config +1 -1
  38. data/vendor/libsodium/packaging/nuget/package.nuspec +27 -25
  39. data/vendor/libsodium/packaging/nuget/package.targets +21 -21
  40. data/vendor/libsodium/src/Makefile.in +1 -5
  41. data/vendor/libsodium/src/libsodium/Makefile.am +49 -45
  42. data/vendor/libsodium/src/libsodium/Makefile.in +488 -488
  43. data/vendor/libsodium/src/libsodium/crypto_sign/crypto_sign.c +15 -0
  44. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/api.h +2 -0
  45. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c +63 -35
  46. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c +61 -33
  47. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-be.h +4 -5
  48. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-le.h +4 -4
  49. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table.h +7 -1
  50. data/vendor/libsodium/src/libsodium/include/Makefile.in +1 -5
  51. data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign.h +10 -0
  52. data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign_ed25519.h +13 -0
  53. data/vendor/libsodium/test/Makefile.in +1 -5
  54. data/vendor/libsodium/test/default/Makefile.am +6 -2
  55. data/vendor/libsodium/test/default/Makefile.in +26 -72
  56. data/vendor/libsodium/test/default/box_easy2.c +17 -2
  57. data/vendor/libsodium/test/default/box_easy2.exp +1 -0
  58. data/vendor/libsodium/test/default/secretbox_easy2.c +7 -0
  59. data/vendor/libsodium/test/default/sign.c +28 -0
  60. metadata +4 -2
data/vendor/libsodium/configure.ac CHANGED
@@ -1,5 +1,5 @@
1
1
  AC_PREREQ([2.65])
2
- AC_INIT([libsodium],[0.6.0],
2
+ AC_INIT([libsodium],[0.6.1],
3
3
  [https://github.com/jedisct1/libsodium/issues],
4
4
  [libsodium],
5
5
  [https://github.com/jedisct1/libsodium])
@@ -16,9 +16,9 @@ ISODATE=`date +%Y-%m-%d`
16
16
  AC_SUBST(ISODATE)
17
17
 
18
18
  SODIUM_LIBRARY_VERSION_MAJOR=6
19
- SODIUM_LIBRARY_VERSION_MINOR=0
19
+ SODIUM_LIBRARY_VERSION_MINOR=1
20
20
  DLL_VERSION=5
21
- SODIUM_LIBRARY_VERSION=11:0:1
21
+ SODIUM_LIBRARY_VERSION=12:0:2
22
22
  # | | |
23
23
  # +------+ | +---+
24
24
  # | | |
@@ -86,6 +86,21 @@ AC_ARG_ENABLE(blocking-random,
86
86
  ])
87
87
  ])
88
88
 
89
+ AC_ARG_ENABLE(minimal,
90
+ [AS_HELP_STRING(--enable-minimal,
91
+ [Only compile the minimum set of functions required for the high-level API])],
92
+ [
93
+ AS_IF([test "x$enableval" = "xyes"], [
94
+ enable_minimal="yes"
95
+ ], [
96
+ enable_minimal="no"
97
+ ])
98
+ ],
99
+ [
100
+ enable_minimal="no"
101
+ ])
102
+ AM_CONDITIONAL([MINIMAL], [test x$enable_minimal = xyes])
103
+
89
104
  AC_ARG_WITH(safecode,
90
105
  [AS_HELP_STRING(--with-safecode,For maintainers only - please do not use)],
91
106
  [AS_IF([test "x$withval" = "xyes"], [
@@ -119,10 +134,6 @@ AC_SUBST([MAINT])
119
134
 
120
135
  dnl Checks
121
136
 
122
- PKG_PROG_PKG_CONFIG([0.23])
123
- AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != "x"])
124
- AC_SUBST(HAVE_PKG_CONFIG)
125
-
126
137
  AC_PROG_CC_C99
127
138
  AM_PROG_AS
128
139
  AC_USE_SYSTEM_EXTENSIONS
data/vendor/libsodium/dist-build/Makefile.in CHANGED
@@ -85,7 +85,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
85
85
  $(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
86
86
  $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
87
87
  $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
88
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
88
+ $(top_srcdir)/configure.ac
89
89
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
90
90
  $(ACLOCAL_M4)
91
91
  mkinstalldirs = $(install_sh) -d
@@ -146,7 +146,6 @@ FGREP = @FGREP@
146
146
  GREP = @GREP@
147
147
  HAVE_AMD64_ASM_V = @HAVE_AMD64_ASM_V@
148
148
  HAVE_CPUID_V = @HAVE_CPUID_V@
149
- HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
150
149
  HAVE_TI_MODE_V = @HAVE_TI_MODE_V@
151
150
  INSTALL = @INSTALL@
152
151
  INSTALL_DATA = @INSTALL_DATA@
@@ -182,9 +181,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
182
181
  PACKAGE_URL = @PACKAGE_URL@
183
182
  PACKAGE_VERSION = @PACKAGE_VERSION@
184
183
  PATH_SEPARATOR = @PATH_SEPARATOR@
185
- PKG_CONFIG = @PKG_CONFIG@
186
- PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
187
- PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
188
184
  RANLIB = @RANLIB@
189
185
  SAFECODE_HOME = @SAFECODE_HOME@
190
186
  SED = @SED@
data/vendor/libsodium/dist-build/emscripten.sh CHANGED
@@ -1,12 +1,13 @@
1
1
  #! /bin/sh
2
2
 
3
3
  export PREFIX="$(pwd)/libsodium-js"
4
- export EXPORTED_FUNCTIONS='["_sodium_version_string"]'
4
+ export EXPORTED_FUNCTIONS='["_crypto_aead_chacha20poly1305_abytes", "_crypto_aead_chacha20poly1305_decrypt", "_crypto_aead_chacha20poly1305_encrypt", "_crypto_aead_chacha20poly1305_keybytes", "_crypto_aead_chacha20poly1305_npubbytes", "_crypto_aead_chacha20poly1305_nsecbytes", "_crypto_auth", "_crypto_auth_bytes", "_crypto_auth_hmacsha256", "_crypto_auth_hmacsha256_bytes", "_crypto_auth_hmacsha256_final", "_crypto_auth_hmacsha256_init", "_crypto_auth_hmacsha256_keybytes", "_crypto_auth_hmacsha256_update", "_crypto_auth_hmacsha256_verify", "_crypto_auth_hmacsha512", "_crypto_auth_hmacsha512256", "_crypto_auth_hmacsha512256_bytes", "_crypto_auth_hmacsha512256_final", "_crypto_auth_hmacsha512256_init", "_crypto_auth_hmacsha512256_keybytes", "_crypto_auth_hmacsha512256_update", "_crypto_auth_hmacsha512256_verify", "_crypto_auth_hmacsha512_bytes", "_crypto_auth_hmacsha512_final", "_crypto_auth_hmacsha512_init", "_crypto_auth_hmacsha512_keybytes", "_crypto_auth_hmacsha512_update", "_crypto_auth_hmacsha512_verify", "_crypto_auth_keybytes", "_crypto_auth_primitive", "_crypto_auth_verify", "_crypto_box", "_crypto_box_afternm", "_crypto_box_beforenm", "_crypto_box_beforenmbytes", "_crypto_box_boxzerobytes", "_crypto_box_curve25519xsalsa20poly1305", "_crypto_box_curve25519xsalsa20poly1305_afternm", "_crypto_box_curve25519xsalsa20poly1305_beforenm", "_crypto_box_curve25519xsalsa20poly1305_beforenmbytes", "_crypto_box_curve25519xsalsa20poly1305_boxzerobytes", "_crypto_box_curve25519xsalsa20poly1305_keypair", "_crypto_box_curve25519xsalsa20poly1305_macbytes", "_crypto_box_curve25519xsalsa20poly1305_noncebytes", "_crypto_box_curve25519xsalsa20poly1305_open", "_crypto_box_curve25519xsalsa20poly1305_open_afternm", "_crypto_box_curve25519xsalsa20poly1305_publickeybytes", "_crypto_box_curve25519xsalsa20poly1305_secretkeybytes", "_crypto_box_curve25519xsalsa20poly1305_seed_keypair", "_crypto_box_curve25519xsalsa20poly1305_seedbytes", "_crypto_box_curve25519xsalsa20poly1305_zerobytes", "_crypto_box_detached", "_crypto_box_easy", "_crypto_box_keypair", "_crypto_box_macbytes", "_crypto_box_noncebytes", "_crypto_box_open", "_crypto_box_open_afternm", "_crypto_box_open_detached", "_crypto_box_open_easy", "_crypto_box_primitive", "_crypto_box_publickeybytes", "_crypto_box_secretkeybytes", "_crypto_box_seed_keypair", "_crypto_box_seedbytes", "_crypto_box_zerobytes", "_crypto_core_hsalsa20", "_crypto_core_hsalsa20_constbytes", "_crypto_core_hsalsa20_inputbytes", "_crypto_core_hsalsa20_keybytes", "_crypto_core_hsalsa20_outputbytes", "_crypto_core_salsa20", "_crypto_core_salsa20_constbytes", "_crypto_core_salsa20_inputbytes", "_crypto_core_salsa20_keybytes", "_crypto_core_salsa20_outputbytes", "_crypto_generichash", "_crypto_generichash_blake2b", "_crypto_generichash_blake2b_bytes", "_crypto_generichash_blake2b_bytes_max", "_crypto_generichash_blake2b_bytes_min", "_crypto_generichash_blake2b_final", "_crypto_generichash_blake2b_init", "_crypto_generichash_blake2b_init_salt_personal", "_crypto_generichash_blake2b_keybytes", "_crypto_generichash_blake2b_keybytes_max", "_crypto_generichash_blake2b_keybytes_min", "_crypto_generichash_blake2b_personalbytes", "_crypto_generichash_blake2b_salt_personal", "_crypto_generichash_blake2b_saltbytes", "_crypto_generichash_blake2b_update", "_crypto_generichash_bytes", "_crypto_generichash_bytes_max", "_crypto_generichash_bytes_min", "_crypto_generichash_final", "_crypto_generichash_init", "_crypto_generichash_keybytes", "_crypto_generichash_keybytes_max", "_crypto_generichash_keybytes_min", "_crypto_generichash_primitive", "_crypto_generichash_update", "_crypto_hash", "_crypto_hash_bytes", "_crypto_hash_primitive", "_crypto_hash_sha256", "_crypto_hash_sha256_bytes", "_crypto_hash_sha256_final", "_crypto_hash_sha256_init", "_crypto_hash_sha256_update", "_crypto_hash_sha512", "_crypto_hash_sha512_bytes", "_crypto_hash_sha512_final", "_crypto_hash_sha512_init", "_crypto_hash_sha512_update", "_crypto_onetimeauth", "_crypto_onetimeauth_bytes", "_crypto_onetimeauth_final", "_crypto_onetimeauth_init", "_crypto_onetimeauth_keybytes", "_crypto_onetimeauth_pick_best_implementation", "_crypto_onetimeauth_poly1305", "_crypto_onetimeauth_poly1305_bytes", "_crypto_onetimeauth_poly1305_final", "_crypto_onetimeauth_poly1305_implementation_name", "_crypto_onetimeauth_poly1305_init", "_crypto_onetimeauth_poly1305_keybytes", "_crypto_onetimeauth_poly1305_set_implementation", "_crypto_onetimeauth_poly1305_update", "_crypto_onetimeauth_poly1305_verify", "_crypto_onetimeauth_primitive", "_crypto_onetimeauth_update", "_crypto_onetimeauth_verify", "_crypto_pwhash_scryptsalsa208sha256", "_crypto_pwhash_scryptsalsa208sha256_ll", "_crypto_pwhash_scryptsalsa208sha256_memlimit_interactive", "_crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive", "_crypto_pwhash_scryptsalsa208sha256_opslimit_interactive", "_crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive", "_crypto_pwhash_scryptsalsa208sha256_saltbytes", "_crypto_pwhash_scryptsalsa208sha256_str", "_crypto_pwhash_scryptsalsa208sha256_str_verify", "_crypto_pwhash_scryptsalsa208sha256_strbytes", "_crypto_scalarmult", "_crypto_scalarmult_base", "_crypto_scalarmult_bytes", "_crypto_scalarmult_curve25519", "_crypto_scalarmult_curve25519_base", "_crypto_scalarmult_curve25519_bytes", "_crypto_scalarmult_curve25519_scalarbytes", "_crypto_scalarmult_primitive", "_crypto_scalarmult_scalarbytes", "_crypto_secretbox", "_crypto_secretbox_boxzerobytes", "_crypto_secretbox_detached", "_crypto_secretbox_easy", "_crypto_secretbox_keybytes", "_crypto_secretbox_macbytes", "_crypto_secretbox_noncebytes", "_crypto_secretbox_open", "_crypto_secretbox_open_detached", "_crypto_secretbox_open_easy", "_crypto_secretbox_primitive", "_crypto_secretbox_xsalsa20poly1305", "_crypto_secretbox_xsalsa20poly1305_boxzerobytes", "_crypto_secretbox_xsalsa20poly1305_keybytes", "_crypto_secretbox_xsalsa20poly1305_macbytes", "_crypto_secretbox_xsalsa20poly1305_noncebytes", "_crypto_secretbox_xsalsa20poly1305_open", "_crypto_secretbox_xsalsa20poly1305_zerobytes", "_crypto_secretbox_zerobytes", "_crypto_shorthash", "_crypto_shorthash_bytes", "_crypto_shorthash_keybytes", "_crypto_shorthash_primitive", "_crypto_shorthash_siphash24", "_crypto_shorthash_siphash24_bytes", "_crypto_shorthash_siphash24_keybytes", "_crypto_sign", "_crypto_sign_bytes", "_crypto_sign_detached", "_crypto_sign_ed25519", "_crypto_sign_ed25519_bytes", "_crypto_sign_ed25519_detached", "_crypto_sign_ed25519_keypair", "_crypto_sign_ed25519_open", "_crypto_sign_ed25519_publickeybytes", "_crypto_sign_ed25519_secretkeybytes", "_crypto_sign_ed25519_seed_keypair", "_crypto_sign_ed25519_seedbytes", "_crypto_sign_ed25519_verify_detached", "_crypto_sign_keypair", "_crypto_sign_open", "_crypto_sign_primitive", "_crypto_sign_publickeybytes", "_crypto_sign_secretkeybytes", "_crypto_sign_seed_keypair", "_crypto_sign_seedbytes", "_crypto_sign_verify_detached", "_crypto_stream", "_crypto_stream_aes128ctr", "_crypto_stream_aes128ctr_afternm", "_crypto_stream_aes128ctr_beforenm", "_crypto_stream_aes128ctr_beforenmbytes", "_crypto_stream_aes128ctr_keybytes", "_crypto_stream_aes128ctr_noncebytes", "_crypto_stream_aes128ctr_xor", "_crypto_stream_aes128ctr_xor_afternm", "_crypto_stream_chacha20", "_crypto_stream_chacha20_keybytes", "_crypto_stream_chacha20_noncebytes", "_crypto_stream_chacha20_xor", "_crypto_stream_chacha20_xor_ic", "_crypto_stream_keybytes", "_crypto_stream_noncebytes", "_crypto_stream_primitive", "_crypto_stream_salsa20", "_crypto_stream_salsa20_keybytes", "_crypto_stream_salsa20_noncebytes", "_crypto_stream_salsa20_xor", "_crypto_stream_salsa20_xor_ic", "_crypto_stream_xor", "_crypto_stream_xsalsa20", "_crypto_stream_xsalsa20_keybytes", "_crypto_stream_xsalsa20_noncebytes", "_crypto_stream_xsalsa20_xor", "_crypto_verify_16", "_crypto_verify_16_bytes", "_crypto_verify_32", "_crypto_verify_32_bytes", "_crypto_verify_64", "_crypto_verify_64_bytes", "_randombytes", "_randombytes_buf", "_randombytes_close", "_randombytes_implementation_name", "_randombytes_random", "_randombytes_salsa20_implementation_name", "_randombytes_salsa20_random", "_randombytes_salsa20_random_buf", "_randombytes_salsa20_random_close", "_randombytes_salsa20_random_stir", "_randombytes_salsa20_random_uniform", "_randombytes_set_implementation", "_randombytes_stir", "_randombytes_sysrandom", "_randombytes_sysrandom_buf", "_randombytes_sysrandom_close", "_randombytes_sysrandom_implementation_name", "_randombytes_sysrandom_stir", "_randombytes_sysrandom_uniform", "_randombytes_uniform", "_sodium_bin2hex", "_sodium_hex2bin", "_sodium_init", "_sodium_library_version_major", "_sodium_library_version_minor", "_sodium_memcmp", "_sodium_memzero", "_sodium_version_string"]'
5
+ export TOTAL_MEMORY=33554432
5
6
  export OPTFLAGS="--llvm-lto 3 -Oz"
6
7
  export CFLAGS="$OPTFLAGS --pre-js=test/default/pre.js "
7
- export LDFLAGS="-s EXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS}"
8
+ export LDFLAGS="-s EXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS} -s TOTAL_MEMORY=${TOTAL_MEMORY}"
8
9
 
9
- emconfigure ./configure --disable-shared --prefix="$PREFIX" && \
10
+ emconfigure ./configure --enable-minimal --disable-shared --prefix="$PREFIX" && \
10
11
  emmake make clean &&
11
12
  emmake make install &&
12
13
  emcc --closure 1 $OPTFLAGS $LDFLAGS \
data/vendor/libsodium/msvc-scripts/Makefile.in CHANGED
@@ -85,7 +85,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
85
85
  $(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
86
86
  $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
87
87
  $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
88
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
88
+ $(top_srcdir)/configure.ac
89
89
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
90
90
  $(ACLOCAL_M4)
91
91
  mkinstalldirs = $(install_sh) -d
@@ -146,7 +146,6 @@ FGREP = @FGREP@
146
146
  GREP = @GREP@
147
147
  HAVE_AMD64_ASM_V = @HAVE_AMD64_ASM_V@
148
148
  HAVE_CPUID_V = @HAVE_CPUID_V@
149
- HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
150
149
  HAVE_TI_MODE_V = @HAVE_TI_MODE_V@
151
150
  INSTALL = @INSTALL@
152
151
  INSTALL_DATA = @INSTALL_DATA@
@@ -182,9 +181,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
182
181
  PACKAGE_URL = @PACKAGE_URL@
183
182
  PACKAGE_VERSION = @PACKAGE_VERSION@
184
183
  PATH_SEPARATOR = @PATH_SEPARATOR@
185
- PKG_CONFIG = @PKG_CONFIG@
186
- PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
187
- PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
188
184
  RANLIB = @RANLIB@
189
185
  SAFECODE_HOME = @SAFECODE_HOME@
190
186
  SED = @SED@
data/vendor/libsodium/msvc-scripts/process.bat CHANGED
@@ -1,4 +1,4 @@
1
- cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/0.6.0/ < src\libsodium\include\sodium\version.h.in > tmp
1
+ cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/0.6.1/ < src\libsodium\include\sodium\version.h.in > tmp
2
2
  cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/6/ < tmp > tmp2
3
- cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/0/ < tmp2 > src\libsodium\include\sodium\version.h
3
+ cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/1/ < tmp2 > src\libsodium\include\sodium\version.h
4
4
  del tmp tmp2
data/vendor/libsodium/packaging/nuget/package.config CHANGED
@@ -1,4 +1,4 @@
1
1
  <?xml version="1.0" encoding="utf-8"?>
2
2
  <!-- These values are populated into the package.gsl templates by package.bat. -->
3
3
  <!-- The target attribute controls path and file name only, id controls package naming. -->
4
- <package id="libsodium_vc120" target="libsodium" version = "0.6.0.0" pathversion="0_5_0_0" platformtoolset="v120" />
4
+ <package id="libsodium_vc120" target="libsodium" version = "0.6.0.1" pathversion="0_6_0_1" platformtoolset="v120" />
data/vendor/libsodium/packaging/nuget/package.nuspec CHANGED
@@ -7,7 +7,7 @@
7
7
  <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
8
8
  <metadata minClientVersion="2.5">
9
9
  <id>libsodium_vc120</id>
10
- <version>0.6.0.0</version>
10
+ <version>0.6.0.1</version>
11
11
  <title>libsodium_vc120</title>
12
12
  <authors>libsodium contributors</authors>
13
13
  <owners>Eric Voskuil</owners>
@@ -21,6 +21,8 @@
21
21
  <releaseNotes>https://raw.github.com/jedisct1/libsodium/master/ChangeLog</releaseNotes>
22
22
  <copyright>(c) 2013-2014, Frank Denis (attribution required)</copyright>
23
23
  <tags>native, NaCl, salt, sodium, libodium, C++</tags>
24
+ <dependencies>
25
+ </dependencies>
24
26
  <!-- Salt shaker icon by Dubravko Soric :
25
27
  http://upload.wikimedia.org/wikipedia/commons/thumb/7/78/Salt_shaker_on_white_background.jpg/220px-Salt_shaker_on_white_background.jpg -->
26
28
  </metadata>
@@ -38,52 +40,52 @@
38
40
  <!-- libraries -->
39
41
 
40
42
  <!-- x86 Dynamic libraries (.dll) -->
41
- <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-0_5_0_0.dll" />
42
- <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-gd-0_5_0_0.dll" />
43
+ <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-0_6_0_1.dll" />
44
+ <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-gd-0_6_0_1.dll" />
43
45
 
44
46
  <!-- x86 Debugging symbols (.pdb) -->
45
- <!--<file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-0_5_0_0.pdb" />-->
46
- <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-gd-0_5_0_0.pdb" />
47
+ <!--<file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-0_6_0_1.pdb" />-->
48
+ <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-gd-0_6_0_1.pdb" />
47
49
 
48
50
  <!-- x86 Import libraries (.imp.lib) -->
49
- <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-0_5_0_0.imp.lib" />
50
- <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-gd-0_5_0_0.imp.lib" />
51
+ <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-0_6_0_1.imp.lib" />
52
+ <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-gd-0_6_0_1.imp.lib" />
51
53
 
52
54
  <!-- x86 Export libraries (.exp) -->
53
- <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x86-v120-mt-0_5_0_0.exp" />
54
- <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x86-v120-mt-gd-0_5_0_0.exp" />
55
+ <file src="..\..\bin\Win32\Release\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x86-v120-mt-0_6_0_1.exp" />
56
+ <file src="..\..\bin\Win32\Debug\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x86-v120-mt-gd-0_6_0_1.exp" />
55
57
 
56
58
  <!-- x86 Static libraries (.lib) -->
57
- <file src="..\..\bin\Win32\Release\v120\static\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_5_0_0.lib" />
58
- <file src="..\..\bin\Win32\Debug\v120\static\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_5_0_0.lib" />
59
+ <file src="..\..\bin\Win32\Release\v120\static\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_6_0_1.lib" />
60
+ <file src="..\..\bin\Win32\Debug\v120\static\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_6_0_1.lib" />
59
61
 
60
62
  <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
61
- <file src="..\..\bin\Win32\Release\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_5_0_0.ltcg.lib" />
62
- <file src="..\..\bin\Win32\Debug\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_5_0_0.ltcg.lib" />
63
+ <file src="..\..\bin\Win32\Release\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_6_0_1.ltcg.lib" />
64
+ <file src="..\..\bin\Win32\Debug\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_6_0_1.ltcg.lib" />
63
65
 
64
66
  <!-- x64 Dynamic libraries (.dll) -->
65
- <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-0_5_0_0.dll" />
66
- <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-gd-0_5_0_0.dll" />
67
+ <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-0_6_0_1.dll" />
68
+ <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-gd-0_6_0_1.dll" />
67
69
 
68
70
  <!-- x64 Debugging symbols (.pdb) -->
69
- <!--<file src="..\..\bin\x64\Release\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-0_5_0_0.pdb" />-->
70
- <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-gd-0_5_0_0.pdb" />
71
+ <!--<file src="..\..\bin\x64\Release\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-0_6_0_1.pdb" />-->
72
+ <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-gd-0_6_0_1.pdb" />
71
73
 
72
74
  <!-- x64 Import libraries (.imp.lib) -->
73
- <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-0_5_0_0.imp.lib" />
74
- <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-gd-0_5_0_0.imp.lib" />
75
+ <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-0_6_0_1.imp.lib" />
76
+ <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-gd-0_6_0_1.imp.lib" />
75
77
 
76
78
  <!-- x64 Export libraries (.exp) -->
77
- <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x64-v120-mt-0_5_0_0.exp" />
78
- <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x64-v120-mt-gd-0_5_0_0.exp" />
79
+ <file src="..\..\bin\x64\Release\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x64-v120-mt-0_6_0_1.exp" />
80
+ <file src="..\..\bin\x64\Debug\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x64-v120-mt-gd-0_6_0_1.exp" />
79
81
 
80
82
  <!-- x64 Static libraries (.lib) -->
81
- <file src="..\..\bin\x64\Release\v120\static\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_5_0_0.lib" />
82
- <file src="..\..\bin\x64\Debug\v120\static\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_5_0_0.lib" />
83
+ <file src="..\..\bin\x64\Release\v120\static\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_6_0_1.lib" />
84
+ <file src="..\..\bin\x64\Debug\v120\static\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_6_0_1.lib" />
83
85
 
84
86
  <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
85
- <file src="..\..\bin\x64\Release\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_5_0_0.ltcg.lib" />
86
- <file src="..\..\bin\x64\Debug\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_5_0_0.ltcg.lib" />
87
+ <file src="..\..\bin\x64\Release\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_6_0_1.ltcg.lib" />
88
+ <file src="..\..\bin\x64\Debug\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_6_0_1.ltcg.lib" />
87
89
  </files>
88
90
  <!--
89
91
  #################################################################
data/vendor/libsodium/packaging/nuget/package.targets CHANGED
@@ -4,7 +4,7 @@
4
4
  # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY #
5
5
  #################################################################
6
6
  -->
7
- <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
7
+ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
8
8
 
9
9
  <!-- user interface -->
10
10
  <ItemGroup>
@@ -30,66 +30,66 @@
30
30
  <!-- static libraries -->
31
31
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
32
32
  <Link>
33
- <AdditionalDependencies>libsodium-x86-v120-mt-s-0_5_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
33
+ <AdditionalDependencies>libsodium-x86-v120-mt-s-0_6_0_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
34
34
  </Link>
35
35
  </ItemDefinitionGroup>
36
36
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
37
37
  <Link>
38
- <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_5_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
38
+ <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_6_0_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
39
39
  </Link>
40
40
  </ItemDefinitionGroup>
41
41
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
42
42
  <Link>
43
- <AdditionalDependencies>libsodium-x64-v120-mt-s-0_5_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
43
+ <AdditionalDependencies>libsodium-x64-v120-mt-s-0_6_0_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
44
44
  </Link>
45
45
  </ItemDefinitionGroup>
46
46
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
47
47
  <Link>
48
- <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_5_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
48
+ <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_6_0_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
49
49
  </Link>
50
50
  </ItemDefinitionGroup>
51
51
 
52
52
  <!-- static ltcg libraries -->
53
53
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
54
54
  <Link>
55
- <AdditionalDependencies>libsodium-x86-v120-mt-s-0_5_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
55
+ <AdditionalDependencies>libsodium-x86-v120-mt-s-0_6_0_1.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
56
56
  </Link>
57
57
  </ItemDefinitionGroup>
58
58
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
59
59
  <Link>
60
- <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_5_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
60
+ <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_6_0_1.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
61
61
  </Link>
62
62
  </ItemDefinitionGroup>
63
63
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
64
64
  <Link>
65
- <AdditionalDependencies>libsodium-x64-v120-mt-s-0_5_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
65
+ <AdditionalDependencies>libsodium-x64-v120-mt-s-0_6_0_1.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
66
66
  </Link>
67
67
  </ItemDefinitionGroup>
68
68
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
69
69
  <Link>
70
- <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_5_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
70
+ <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_6_0_1.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
71
71
  </Link>
72
72
  </ItemDefinitionGroup>
73
73
 
74
74
  <!-- dynamic import libraries -->
75
75
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
76
76
  <Link>
77
- <AdditionalDependencies>libsodium-x86-v120-mt-0_5_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
77
+ <AdditionalDependencies>libsodium-x86-v120-mt-0_6_0_1.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
78
78
  </Link>
79
79
  </ItemDefinitionGroup>
80
80
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
81
81
  <Link>
82
- <AdditionalDependencies>libsodium-x86-v120-mt-gd-0_5_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
82
+ <AdditionalDependencies>libsodium-x86-v120-mt-gd-0_6_0_1.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
83
83
  </Link>
84
84
  </ItemDefinitionGroup>
85
85
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
86
86
  <Link>
87
- <AdditionalDependencies>libsodium-x64-v120-mt-0_5_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
87
+ <AdditionalDependencies>libsodium-x64-v120-mt-0_6_0_1.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
88
88
  </Link>
89
89
  </ItemDefinitionGroup>
90
90
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
91
91
  <Link>
92
- <AdditionalDependencies>libsodium-x64-v120-mt-gd-0_5_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
92
+ <AdditionalDependencies>libsodium-x64-v120-mt-gd-0_6_0_1.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
93
93
  </Link>
94
94
  </ItemDefinitionGroup>
95
95
 
@@ -98,26 +98,26 @@
98
98
  <Target Name="libsodium_AfterBuild_Win32_v120_Dynamic_Release"
99
99
  Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
100
100
  AfterTargets="libsodium_AfterBuild">
101
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_5_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
102
- <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_5_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
101
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_6_0_1.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
102
+ <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_6_0_1.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
103
103
  </Target>
104
104
  <Target Name="libsodium_AfterBuild_Win32_v120_Dynamic_Debug"
105
105
  Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
106
106
  AfterTargets="libsodium_AfterBuild">
107
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_5_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
108
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_5_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
107
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_6_0_1.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
108
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_6_0_1.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
109
109
  </Target>
110
110
  <Target Name="libsodium_AfterBuild_x64_v120_Dynamic_Release"
111
111
  Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
112
112
  AfterTargets="libsodium_AfterBuild">
113
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_5_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
114
- <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_5_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
113
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_6_0_1.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
114
+ <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_6_0_1.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
115
115
  </Target>
116
116
  <Target Name="libsodium_AfterBuild_x64_v120_Dynamic_Debug"
117
117
  Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
118
118
  AfterTargets="libsodium_AfterBuild">
119
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_5_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
120
- <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_5_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
119
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_6_0_1.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
120
+ <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_6_0_1.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
121
121
  </Target>
122
122
 
123
123
  <!--
data/vendor/libsodium/src/Makefile.in CHANGED
@@ -85,7 +85,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
85
85
  $(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
86
86
  $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
87
87
  $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
88
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
88
+ $(top_srcdir)/configure.ac
89
89
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
90
90
  $(ACLOCAL_M4)
91
91
  mkinstalldirs = $(install_sh) -d
@@ -206,7 +206,6 @@ FGREP = @FGREP@
206
206
  GREP = @GREP@
207
207
  HAVE_AMD64_ASM_V = @HAVE_AMD64_ASM_V@
208
208
  HAVE_CPUID_V = @HAVE_CPUID_V@
209
- HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
210
209
  HAVE_TI_MODE_V = @HAVE_TI_MODE_V@
211
210
  INSTALL = @INSTALL@
212
211
  INSTALL_DATA = @INSTALL_DATA@
@@ -242,9 +241,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
242
241
  PACKAGE_URL = @PACKAGE_URL@
243
242
  PACKAGE_VERSION = @PACKAGE_VERSION@
244
243
  PATH_SEPARATOR = @PATH_SEPARATOR@
245
- PKG_CONFIG = @PKG_CONFIG@
246
- PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
247
- PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
248
244
  RANLIB = @RANLIB@
249
245
  SAFECODE_HOME = @SAFECODE_HOME@
250
246
  SED = @SED@
data/vendor/libsodium/src/libsodium/Makefile.am CHANGED
@@ -30,12 +30,6 @@ libsodium_la_SOURCES = \
30
30
  crypto_core/salsa20/ref/core_salsa20.c \
31
31
  crypto_core/salsa20/core_salsa20_api.c \
32
32
  crypto_core/salsa20/ref/api.h \
33
- crypto_core/salsa2012/ref/core_salsa2012.c \
34
- crypto_core/salsa2012/core_salsa2012_api.c \
35
- crypto_core/salsa2012/ref/api.h \
36
- crypto_core/salsa208/ref/core_salsa208.c \
37
- crypto_core/salsa208/core_salsa208_api.c \
38
- crypto_core/salsa208/ref/api.h \
39
33
  crypto_generichash/crypto_generichash.c \
40
34
  crypto_generichash/blake2/generichash_blake2_api.c \
41
35
  crypto_generichash/blake2/ref/api.h \
@@ -136,49 +130,11 @@ libsodium_la_SOURCES = \
136
130
  crypto_sign/ed25519/ref10/sc_reduce.c \
137
131
  crypto_sign/ed25519/ref10/sign.c \
138
132
  crypto_sign/ed25519/ref10/sqrtm1.h \
139
- crypto_sign/edwards25519sha512batch/sign_edwards25519sha512batch_api.c \
140
- crypto_sign/edwards25519sha512batch/ref/api.h \
141
- crypto_sign/edwards25519sha512batch/ref/fe25519.h \
142
- crypto_sign/edwards25519sha512batch/ref/fe25519_edwards25519sha512batch.c \
143
- crypto_sign/edwards25519sha512batch/ref/ge25519.h \
144
- crypto_sign/edwards25519sha512batch/ref/ge25519_edwards25519sha512batch.c \
145
- crypto_sign/edwards25519sha512batch/ref/sc25519.h \
146
- crypto_sign/edwards25519sha512batch/ref/sc25519_edwards25519sha512batch.c \
147
- crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c \
148
133
  crypto_stream/crypto_stream.c \
149
- crypto_stream/aes128ctr/portable/afternm_aes128ctr.c \
150
- crypto_stream/aes128ctr/stream_aes128ctr_api.c \
151
- crypto_stream/aes128ctr/portable/api.h \
152
- crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c \
153
- crypto_stream/aes128ctr/portable/common.h \
154
- crypto_stream/aes128ctr/portable/common_aes128ctr.c \
155
- crypto_stream/aes128ctr/portable/consts.h \
156
- crypto_stream/aes128ctr/portable/consts_aes128ctr.c \
157
- crypto_stream/aes128ctr/portable/int128.h \
158
- crypto_stream/aes128ctr/portable/int128_aes128ctr.c \
159
- crypto_stream/aes128ctr/portable/stream_aes128ctr.c \
160
- crypto_stream/aes128ctr/portable/types.h \
161
- crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c \
162
- crypto_stream/aes256estream/hongjun/aes-table.h \
163
- crypto_stream/aes256estream/hongjun/aes-table-be.h \
164
- crypto_stream/aes256estream/hongjun/aes-table-le.h \
165
- crypto_stream/aes256estream/hongjun/aes256-ctr.c \
166
- crypto_stream/aes256estream/hongjun/aes256.h \
167
- crypto_stream/aes256estream/stream_aes256estream_api.c \
168
- crypto_stream/aes256estream/hongjun/api.h \
169
- crypto_stream/aes256estream/hongjun/ecrypt-sync.h \
170
134
  crypto_stream/chacha20/stream_chacha20_api.c \
171
135
  crypto_stream/chacha20/ref/api.h \
172
136
  crypto_stream/chacha20/ref/stream_chacha20_ref.c \
173
137
  crypto_stream/salsa20/stream_salsa20_api.c \
174
- crypto_stream/salsa2012/stream_salsa2012_api.c \
175
- crypto_stream/salsa2012/ref/api.h \
176
- crypto_stream/salsa2012/ref/stream_salsa2012.c \
177
- crypto_stream/salsa2012/ref/xor_salsa2012.c \
178
- crypto_stream/salsa208/stream_salsa208_api.c \
179
- crypto_stream/salsa208/ref/api.h \
180
- crypto_stream/salsa208/ref/stream_salsa208.c \
181
- crypto_stream/salsa208/ref/xor_salsa208.c \
182
138
  crypto_stream/xsalsa20/stream_xsalsa20_api.c \
183
139
  crypto_stream/xsalsa20/ref/api.h \
184
140
  crypto_stream/xsalsa20/ref/stream_xsalsa20.c \
@@ -195,7 +151,6 @@ libsodium_la_SOURCES = \
195
151
  randombytes/randombytes.c \
196
152
  randombytes/salsa20/randombytes_salsa20_random.c \
197
153
  randombytes/sysrandom/randombytes_sysrandom.c \
198
- sodium/compat.c \
199
154
  sodium/core.c \
200
155
  sodium/runtime.c \
201
156
  sodium/utils.c \
@@ -239,6 +194,55 @@ libsodium_la_SOURCES += \
239
194
  crypto_stream/salsa20/ref/xor_salsa20_ref.c
240
195
  endif
241
196
 
197
+ if !MINIMAL
198
+ libsodium_la_SOURCES += \
199
+ crypto_core/salsa2012/ref/core_salsa2012.c \
200
+ crypto_core/salsa2012/core_salsa2012_api.c \
201
+ crypto_core/salsa2012/ref/api.h \
202
+ crypto_core/salsa208/ref/core_salsa208.c \
203
+ crypto_core/salsa208/core_salsa208_api.c \
204
+ crypto_core/salsa208/ref/api.h \
205
+ crypto_sign/edwards25519sha512batch/sign_edwards25519sha512batch_api.c \
206
+ crypto_sign/edwards25519sha512batch/ref/api.h \
207
+ crypto_sign/edwards25519sha512batch/ref/fe25519.h \
208
+ crypto_sign/edwards25519sha512batch/ref/fe25519_edwards25519sha512batch.c \
209
+ crypto_sign/edwards25519sha512batch/ref/ge25519.h \
210
+ crypto_sign/edwards25519sha512batch/ref/ge25519_edwards25519sha512batch.c \
211
+ crypto_sign/edwards25519sha512batch/ref/sc25519.h \
212
+ crypto_sign/edwards25519sha512batch/ref/sc25519_edwards25519sha512batch.c \
213
+ crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c \
214
+ crypto_stream/aes128ctr/portable/afternm_aes128ctr.c \
215
+ crypto_stream/aes128ctr/stream_aes128ctr_api.c \
216
+ crypto_stream/aes128ctr/portable/api.h \
217
+ crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c \
218
+ crypto_stream/aes128ctr/portable/common.h \
219
+ crypto_stream/aes128ctr/portable/common_aes128ctr.c \
220
+ crypto_stream/aes128ctr/portable/consts.h \
221
+ crypto_stream/aes128ctr/portable/consts_aes128ctr.c \
222
+ crypto_stream/aes128ctr/portable/int128.h \
223
+ crypto_stream/aes128ctr/portable/int128_aes128ctr.c \
224
+ crypto_stream/aes128ctr/portable/stream_aes128ctr.c \
225
+ crypto_stream/aes128ctr/portable/types.h \
226
+ crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c \
227
+ crypto_stream/aes256estream/hongjun/aes-table.h \
228
+ crypto_stream/aes256estream/hongjun/aes-table-be.h \
229
+ crypto_stream/aes256estream/hongjun/aes-table-le.h \
230
+ crypto_stream/aes256estream/hongjun/aes256-ctr.c \
231
+ crypto_stream/aes256estream/hongjun/aes256.h \
232
+ crypto_stream/aes256estream/stream_aes256estream_api.c \
233
+ crypto_stream/aes256estream/hongjun/api.h \
234
+ crypto_stream/aes256estream/hongjun/ecrypt-sync.h \
235
+ crypto_stream/salsa2012/stream_salsa2012_api.c \
236
+ crypto_stream/salsa2012/ref/api.h \
237
+ crypto_stream/salsa2012/ref/stream_salsa2012.c \
238
+ crypto_stream/salsa2012/ref/xor_salsa2012.c \
239
+ crypto_stream/salsa208/stream_salsa208_api.c \
240
+ crypto_stream/salsa208/ref/api.h \
241
+ crypto_stream/salsa208/ref/stream_salsa208.c \
242
+ crypto_stream/salsa208/ref/xor_salsa208.c \
243
+ sodium/compat.c
244
+ endif
245
+
242
246
  libsodium_la_LDFLAGS = \
243
247
  $(AM_LDFLAGS) \
244
248
  -export-dynamic \