rbnacl-libsodium 0.6.1 → 0.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (89) 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/AUTHORS +0 -3
  5. data/vendor/libsodium/ChangeLog +24 -0
  6. data/vendor/libsodium/THANKS +2 -0
  7. data/vendor/libsodium/autom4te.cache/output.1 +35 -147
  8. data/vendor/libsodium/autom4te.cache/output.3 +35 -147
  9. data/vendor/libsodium/autom4te.cache/requests +127 -127
  10. data/vendor/libsodium/autom4te.cache/traces.1 +244 -254
  11. data/vendor/libsodium/autom4te.cache/traces.3 +111 -113
  12. data/vendor/libsodium/builds/msvc/properties/Common.props +3 -1
  13. data/vendor/libsodium/builds/msvc/properties/Release.props +1 -3
  14. data/vendor/libsodium/builds/msvc/version.h +3 -3
  15. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj +1 -11
  16. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +1 -37
  17. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj +10 -1
  18. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj.filters +10 -1
  19. data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj +1 -11
  20. data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +1 -37
  21. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj +10 -1
  22. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj.filters +10 -1
  23. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj +1 -11
  24. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +1 -37
  25. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj +10 -1
  26. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj.filters +10 -1
  27. data/vendor/libsodium/configure +33 -145
  28. data/vendor/libsodium/configure.ac +22 -23
  29. data/vendor/libsodium/dist-build/android-build.sh +1 -0
  30. data/vendor/libsodium/dist-build/emscripten.sh +2 -2
  31. data/vendor/libsodium/dist-build/ios.sh +1 -0
  32. data/vendor/libsodium/libsodium.pc.in +1 -1
  33. data/vendor/libsodium/libsodium.vcxproj +1 -5
  34. data/vendor/libsodium/libsodium.vcxproj.filters +1 -13
  35. data/vendor/libsodium/msvc-scripts/process.bat +3 -3
  36. data/vendor/libsodium/msvc-scripts/sodium.props +4 -1
  37. data/vendor/libsodium/src/libsodium/Makefile.am +1 -10
  38. data/vendor/libsodium/src/libsodium/Makefile.in +5 -79
  39. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/cp/verify_hmacsha256.c +3 -1
  40. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/cp/verify_hmacsha512.c +3 -1
  41. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c +3 -1
  42. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c +6 -0
  43. data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/pow225521.h +2 -2
  44. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/keypair.c +46 -3
  45. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c +2 -10
  46. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c +7 -1
  47. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/sign_ed25519_api.c +18 -0
  48. data/vendor/libsodium/src/libsodium/include/Makefile.am +0 -1
  49. data/vendor/libsodium/src/libsodium/include/Makefile.in +0 -1
  50. data/vendor/libsodium/src/libsodium/include/sodium.h +0 -1
  51. data/vendor/libsodium/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h +1 -2
  52. data/vendor/libsodium/src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h +5 -0
  53. data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign_ed25519.h +15 -0
  54. data/vendor/libsodium/src/libsodium/include/sodium/utils.h +54 -3
  55. data/vendor/libsodium/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c +22 -7
  56. data/vendor/libsodium/src/libsodium/sodium/core.c +2 -0
  57. data/vendor/libsodium/src/libsodium/sodium/utils.c +305 -31
  58. data/vendor/libsodium/test/default/Makefile.am +18 -16
  59. data/vendor/libsodium/test/default/Makefile.in +141 -76
  60. data/vendor/libsodium/test/default/ed25519_convert.c +48 -0
  61. data/vendor/libsodium/test/default/ed25519_convert.exp +3 -0
  62. data/vendor/libsodium/test/default/sign.c +15 -4
  63. data/vendor/libsodium/test/default/sodium_utils2.c +70 -0
  64. data/vendor/libsodium/test/default/sodium_utils2.exp +3 -0
  65. data/vendor/libsodium/test/default/sodium_utils3.c +55 -0
  66. data/vendor/libsodium/test/default/sodium_utils3.exp +2 -0
  67. metadata +8 -24
  68. data/vendor/libsodium/src/libsodium/crypto_auth/try.c +0 -119
  69. data/vendor/libsodium/src/libsodium/crypto_box/try.c +0 -195
  70. data/vendor/libsodium/src/libsodium/crypto_hash/try.c +0 -76
  71. data/vendor/libsodium/src/libsodium/crypto_scalarmult/try.c +0 -125
  72. data/vendor/libsodium/src/libsodium/crypto_secretbox/try.c +0 -129
  73. data/vendor/libsodium/src/libsodium/crypto_sign/try.c +0 -87
  74. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-be.h +0 -273
  75. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-le.h +0 -274
  76. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table.h +0 -62
  77. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes256-ctr.c +0 -239
  78. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes256.h +0 -171
  79. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/api.h +0 -13
  80. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/ecrypt-sync.h +0 -27
  81. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/stream_aes256estream_api.c +0 -16
  82. data/vendor/libsodium/src/libsodium/crypto_stream/try.c +0 -122
  83. data/vendor/libsodium/src/libsodium/crypto_verify/try.c +0 -76
  84. data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_aes256estream.h +0 -67
  85. data/vendor/libsodium/src/libsodium/sodium/compat.c +0 -361
  86. data/vendor/libsodium/test/default/stream5.c +0 -29
  87. data/vendor/libsodium/test/default/stream5.exp +0 -1
  88. data/vendor/libsodium/test/default/stream6.c +0 -54
  89. data/vendor/libsodium/test/default/stream6.exp +0 -17
data/vendor/libsodium/configure.ac CHANGED
@@ -1,5 +1,5 @@
1
1
  AC_PREREQ([2.65])
2
- AC_INIT([libsodium],[0.6.1],
2
+ AC_INIT([libsodium],[0.7.0],
3
3
  [https://github.com/jedisct1/libsodium/issues],
4
4
  [libsodium],
5
5
  [https://github.com/jedisct1/libsodium])
@@ -15,10 +15,10 @@ AC_SUBST(VERSION)
15
15
  ISODATE=`date +%Y-%m-%d`
16
16
  AC_SUBST(ISODATE)
17
17
 
18
- SODIUM_LIBRARY_VERSION_MAJOR=6
19
- SODIUM_LIBRARY_VERSION_MINOR=1
20
- DLL_VERSION=5
21
- SODIUM_LIBRARY_VERSION=12:0:2
18
+ SODIUM_LIBRARY_VERSION_MAJOR=7
19
+ SODIUM_LIBRARY_VERSION_MINOR=0
20
+ DLL_VERSION=6
21
+ SODIUM_LIBRARY_VERSION=13:0:0
22
22
  # | | |
23
23
  # +------+ | +---+
24
24
  # | | |
@@ -70,13 +70,11 @@ AS_IF([test "x$EMSCRIPTEN" != "x"],[
70
70
  AC_MSG_WARN([compiling to javascript - asm implementations disabled])
71
71
  ])
72
72
 
73
- AS_CASE([$host], [x86_64-*-mingw* | x86_64-*-cygwin*], [enable_asm="no"])
74
-
75
73
  AC_ARG_ENABLE(pie,
76
74
  [AS_HELP_STRING(--disable-pie,Do not produce position independent executables)],
77
75
  enable_pie=$enableval, enable_pie="maybe")
78
76
 
79
- AS_CASE([$host_os], [mingw*], [enable_pie="no"])
77
+ AS_CASE([$host_os], [mingw*|cygwin*|msys], [enable_pie="no"])
80
78
 
81
79
  AC_ARG_ENABLE(blocking-random,
82
80
  [AS_HELP_STRING(--enable-blocking-random,Use /dev/random instead of /dev/urandom)],
@@ -142,10 +140,12 @@ CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
142
140
  AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],
143
141
  [CFLAGS="$CFLAGS -fvisibility=hidden"])
144
142
 
145
- AX_CHECK_COMPILE_FLAG([-fPIC], [
146
- AX_CHECK_LINK_FLAG([-fPIC],
147
- [CFLAGS="$CFLAGS -fPIC"]
148
- )
143
+ AS_CASE([$host_os], [cygwin*|mingw*|msys|pw32*|cegcc*], [ ], [
144
+ AX_CHECK_COMPILE_FLAG([-fPIC], [
145
+ AX_CHECK_LINK_FLAG([-fPIC],
146
+ [CFLAGS="$CFLAGS -fPIC"]
147
+ )
148
+ ])
149
149
  ])
150
150
 
151
151
  AS_IF([test "$enable_pie" != "no"],[
@@ -174,7 +174,7 @@ AC_ARG_ENABLE(soname-versions,
174
174
  )
175
175
 
176
176
  AS_CASE([$host_os],
177
- [cygwin* | mingw* | pw32* | cegcc*], [
177
+ [cygwin*|mingw*|msys|pw32*|cegcc*], [
178
178
  AX_CHECK_LINK_FLAG([-Wl,--dynamicbase], [LDFLAGS="$LDFLAGS -Wl,--dynamicbase"])
179
179
  AX_CHECK_LINK_FLAG([-Wl,--nxcompat], [LDFLAGS="$LDFLAGS -Wl,--nxcompat"])
180
180
  ])
@@ -182,7 +182,7 @@ AS_CASE([$host_os],
182
182
  AS_IF([test "x$enable_ssp" != "xno"],[
183
183
 
184
184
  AS_CASE([$host_os],
185
- [cygwin* | mingw* | pw32* | cegcc*], [ ],
185
+ [cygwin*|mingw*|msys|pw32*|cegcc*], [ ],
186
186
  [dragonfly*], [
187
187
  AX_CHECK_COMPILE_FLAG([-fstack-protector], [
188
188
  AX_CHECK_LINK_FLAG([-fstack-protector],
@@ -320,18 +320,21 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
320
320
 
321
321
  HAVE_AMD64_ASM_V=0
322
322
  AS_IF([test "$enable_asm" != "no"],[
323
- AC_MSG_CHECKING(whether we can assemble basic amd64 code)
323
+ AC_MSG_CHECKING(whether we should use x86_64 asm code)
324
324
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
325
325
  ]], [[
326
326
  #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
327
+ # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)
328
+ # error Windows x86_64 calling conventions are not supported yet
329
+ # endif
327
330
  /* neat */
328
331
  #else
329
- # error !amd64
332
+ # error !x86_64
330
333
  #endif
331
334
  __asm__("pxor %xmm12,%xmm6");
332
335
  ]])],
333
336
  [AC_MSG_RESULT(yes)
334
- AC_DEFINE([HAVE_AMD64_ASM], [1], [basic amd64 code can be assembled])
337
+ AC_DEFINE([HAVE_AMD64_ASM], [1], [x86_64 asm code should be used])
335
338
  HAVE_AMD64_ASM_V=1],
336
339
  [AC_MSG_RESULT(no)])
337
340
  ])
@@ -406,14 +409,10 @@ AS_CASE([$host_cpu],
406
409
 
407
410
  dnl Checks for functions and headers
408
411
 
409
- AC_CHECK_FUNC(clock_gettime, , [AC_CHECK_LIB(rt, clock_gettime)])
410
- AC_CHECK_FUNC(fegetenv, , [AC_CHECK_LIB(m, fegetenv)])
411
-
412
412
  AS_IF([test "x$EMSCRIPTEN" = "x"],[
413
413
  AC_CHECK_FUNCS([arc4random arc4random_buf])
414
414
  ])
415
- AC_CHECK_FUNCS([mlock VirtualLock])
416
- AC_CHECK_FUNCS([SecureZeroMemory explicit_bzero posix_memalign])
415
+ AC_CHECK_FUNCS([mlock mprotect explicit_bzero posix_memalign])
417
416
 
418
417
  AC_SUBST([LIBTOOL_EXTRA_FLAGS])
419
418
 
@@ -425,7 +424,7 @@ gl_LD_OUTPUT_DEF
425
424
 
426
425
  dnl Output.
427
426
 
428
- AH_VERBATIM([NDEBUG], [/* Never ever ignore assertions */
427
+ AH_VERBATIM([NDEBUG], [/* Always evaluate assert() calls */
429
428
  #ifdef NDEBUG
430
429
  #/**/undef/**/ NDEBUG
431
430
  #endif])
data/vendor/libsodium/dist-build/android-build.sh CHANGED
@@ -31,6 +31,7 @@ $MAKE_TOOLCHAIN --platform="${NDK_PLATFORM:-android-14}" \
31
31
  ./configure --host="${HOST_COMPILER}" \
32
32
  --with-sysroot="${TOOLCHAIN_DIR}/sysroot" \
33
33
  --prefix="${PREFIX}" \
34
+ --enable-minimal \
34
35
  --disable-soname-versions && \
35
36
  make clean && \
36
37
  make -j3 install && \
data/vendor/libsodium/dist-build/emscripten.sh CHANGED
@@ -1,9 +1,9 @@
1
1
  #! /bin/sh
2
2
 
3
3
  export PREFIX="$(pwd)/libsodium-js"
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"]'
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_keybytes","_crypto_auth_verify","_crypto_box","_crypto_box_detached","_crypto_box_easy","_crypto_box_keypair","_crypto_box_macbytes","_crypto_box_noncebytes","_crypto_box_open","_crypto_box_open_detached","_crypto_box_open_easy","_crypto_box_publickeybytes","_crypto_box_secretkeybytes","_crypto_box_seed_keypair","_crypto_box_seedbytes","_crypto_generichash","_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_update","_crypto_hash","_crypto_hash_bytes","_crypto_scalarmult","_crypto_scalarmult_base","_crypto_scalarmult_bytes","_crypto_scalarmult_scalarbytes","_crypto_secretbox","_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_shorthash","_crypto_shorthash_bytes","_crypto_shorthash_keybytes","_crypto_sign","_crypto_sign_bytes","_crypto_sign_detached","_crypto_sign_ed25519_pk_to_curve25519","_crypto_sign_ed25519_sk_to_curve25519","_crypto_sign_keypair","_crypto_sign_open","_crypto_sign_publickeybytes","_crypto_sign_secretkeybytes","_crypto_sign_seed_keypair","_crypto_sign_seedbytes","_crypto_sign_verify_detached","_randombytes","_randombytes_buf","_randombytes_close","_randombytes_random","_randombytes_set_implementation","_randombytes_stir","_randombytes_sysrandom","_randombytes_sysrandom_buf","_randombytes_sysrandom_close","_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
5
  export TOTAL_MEMORY=33554432
6
- export OPTFLAGS="--llvm-lto 3 -Oz"
6
+ export OPTFLAGS="--llvm-lto 1 -Oz --emit-symbol-map"
7
7
  export CFLAGS="$OPTFLAGS --pre-js=test/default/pre.js "
8
8
  export LDFLAGS="-s EXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS} -s TOTAL_MEMORY=${TOTAL_MEMORY}"
9
9
 
data/vendor/libsodium/dist-build/ios.sh CHANGED
@@ -10,6 +10,7 @@ export PREFIX="$(pwd)/libsodium-ios"
10
10
 
11
11
  ./configure --host=arm-apple-darwin10 \
12
12
  --disable-shared \
13
+ --enable-minimal \
13
14
  --prefix="$PREFIX" && \
14
15
  make clean && \
15
16
  make -j3 install && \
data/vendor/libsodium/libsodium.pc.in CHANGED
@@ -1,5 +1,5 @@
1
1
  prefix=@prefix@
2
- exec_prefix=@prefix@
2
+ exec_prefix=@exec_prefix@
3
3
  libdir=@libdir@
4
4
  includedir=@includedir@
5
5
 
data/vendor/libsodium/libsodium.vcxproj CHANGED
@@ -349,7 +349,6 @@
349
349
  <ClInclude Include="src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" />
350
350
  <ClInclude Include="src\libsodium\include\sodium\crypto_stream.h" />
351
351
  <ClInclude Include="src\libsodium\include\sodium\crypto_stream_aes128ctr.h" />
352
- <ClInclude Include="src\libsodium\include\sodium\crypto_stream_aes256estream.h" />
353
352
  <ClInclude Include="src\libsodium\include\sodium\crypto_stream_chacha20.h" />
354
353
  <ClInclude Include="src\libsodium\include\sodium\crypto_stream_salsa20.h" />
355
354
  <ClInclude Include="src\libsodium\include\sodium\crypto_stream_salsa2012.h" />
@@ -497,8 +496,6 @@
497
496
  <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c" />
498
497
  <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\xor_afternm_aes128ctr.c" />
499
498
  <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
500
- <ClCompile Include="src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c" />
501
- <ClCompile Include="src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c" />
502
499
  <ClCompile Include="src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.c" />
503
500
  <ClCompile Include="src\libsodium\crypto_stream\chacha20\stream_chacha20_api.c" />
504
501
  <ClCompile Include="src\libsodium\crypto_stream\crypto_stream.c" />
@@ -523,7 +520,6 @@
523
520
  <ClCompile Include="src\libsodium\randombytes\randombytes.c" />
524
521
  <ClCompile Include="src\libsodium\randombytes\salsa20\randombytes_salsa20_random.c" />
525
522
  <ClCompile Include="src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c" />
526
- <ClCompile Include="src\libsodium\sodium\compat.c" />
527
523
  <ClCompile Include="src\libsodium\sodium\core.c" />
528
524
  <ClCompile Include="src\libsodium\sodium\runtime.c" />
529
525
  <ClCompile Include="src\libsodium\sodium\utils.c" />
@@ -532,4 +528,4 @@
532
528
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
533
529
  <ImportGroup Label="ExtensionTargets">
534
530
  </ImportGroup>
535
- </Project>
531
+ </Project>
data/vendor/libsodium/libsodium.vcxproj.filters CHANGED
@@ -105,9 +105,6 @@
105
105
  <ClInclude Include="src\libsodium\include\sodium\crypto_stream_aes128ctr.h">
106
106
  <Filter>Header Files</Filter>
107
107
  </ClInclude>
108
- <ClInclude Include="src\libsodium\include\sodium\crypto_stream_aes256estream.h">
109
- <Filter>Header Files</Filter>
110
- </ClInclude>
111
108
  <ClInclude Include="src\libsodium\include\sodium\crypto_stream_salsa20.h">
112
109
  <Filter>Header Files</Filter>
113
110
  </ClInclude>
@@ -452,9 +449,6 @@
452
449
  <ClCompile Include="src\libsodium\crypto_sign\edwards25519sha512batch\sign_edwards25519sha512batch_api.c">
453
450
  <Filter>Source Files</Filter>
454
451
  </ClCompile>
455
- <ClCompile Include="src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c">
456
- <Filter>Source Files</Filter>
457
- </ClCompile>
458
452
  <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\afternm_aes128ctr.c">
459
453
  <Filter>Source Files</Filter>
460
454
  </ClCompile>
@@ -479,9 +473,6 @@
479
473
  <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c">
480
474
  <Filter>Source Files</Filter>
481
475
  </ClCompile>
482
- <ClCompile Include="src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c">
483
- <Filter>Source Files</Filter>
484
- </ClCompile>
485
476
  <ClCompile Include="src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c">
486
477
  <Filter>Source Files</Filter>
487
478
  </ClCompile>
@@ -539,9 +530,6 @@
539
530
  <ClCompile Include="src\libsodium\crypto_verify\64\verify_64_api.c">
540
531
  <Filter>Source Files</Filter>
541
532
  </ClCompile>
542
- <ClCompile Include="src\libsodium\sodium\compat.c">
543
- <Filter>Source Files</Filter>
544
- </ClCompile>
545
533
  <ClCompile Include="src\libsodium\sodium\core.c">
546
534
  <Filter>Source Files</Filter>
547
535
  </ClCompile>
@@ -651,4 +639,4 @@
651
639
  <Filter>Source Files</Filter>
652
640
  </ClCompile>
653
641
  </ItemGroup>
654
- </Project>
642
+ </Project>
data/vendor/libsodium/msvc-scripts/process.bat CHANGED
@@ -1,4 +1,4 @@
1
- cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/0.6.1/ < src\libsodium\include\sodium\version.h.in > tmp
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@/1/ < tmp2 > src\libsodium\include\sodium\version.h
1
+ cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/0.7.0/ < src\libsodium\include\sodium\version.h.in > tmp
2
+ cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/7/ < tmp > tmp2
3
+ cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/0/ < tmp2 > src\libsodium\include\sodium\version.h
4
4
  del tmp tmp2
data/vendor/libsodium/msvc-scripts/sodium.props CHANGED
@@ -6,7 +6,10 @@
6
6
  <ItemDefinitionGroup>
7
7
  <ClCompile>
8
8
  <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9
- <PreprocessorDefinitions>inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
10
+ <PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
11
+ <PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
12
+ <PreprocessorDefinitions>inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
10
13
  </ClCompile>
11
14
  <PreBuildEvent>
12
15
  <Command>$(SolutionDir)/msvc-scripts/process.bat</Command>
data/vendor/libsodium/src/libsodium/Makefile.am CHANGED
@@ -224,14 +224,6 @@ libsodium_la_SOURCES += \
224
224
  crypto_stream/aes128ctr/portable/stream_aes128ctr.c \
225
225
  crypto_stream/aes128ctr/portable/types.h \
226
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
227
  crypto_stream/salsa2012/stream_salsa2012_api.c \
236
228
  crypto_stream/salsa2012/ref/api.h \
237
229
  crypto_stream/salsa2012/ref/stream_salsa2012.c \
@@ -239,8 +231,7 @@ libsodium_la_SOURCES += \
239
231
  crypto_stream/salsa208/stream_salsa208_api.c \
240
232
  crypto_stream/salsa208/ref/api.h \
241
233
  crypto_stream/salsa208/ref/stream_salsa208.c \
242
- crypto_stream/salsa208/ref/xor_salsa208.c \
243
- sodium/compat.c
234
+ crypto_stream/salsa208/ref/xor_salsa208.c
244
235
  endif
245
236
 
246
237
  libsodium_la_LDFLAGS = \
data/vendor/libsodium/src/libsodium/Makefile.in CHANGED
@@ -142,14 +142,6 @@ host_triplet = @host@
142
142
  @MINIMAL_FALSE@ crypto_stream/aes128ctr/portable/stream_aes128ctr.c \
143
143
  @MINIMAL_FALSE@ crypto_stream/aes128ctr/portable/types.h \
144
144
  @MINIMAL_FALSE@ crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c \
145
- @MINIMAL_FALSE@ crypto_stream/aes256estream/hongjun/aes-table.h \
146
- @MINIMAL_FALSE@ crypto_stream/aes256estream/hongjun/aes-table-be.h \
147
- @MINIMAL_FALSE@ crypto_stream/aes256estream/hongjun/aes-table-le.h \
148
- @MINIMAL_FALSE@ crypto_stream/aes256estream/hongjun/aes256-ctr.c \
149
- @MINIMAL_FALSE@ crypto_stream/aes256estream/hongjun/aes256.h \
150
- @MINIMAL_FALSE@ crypto_stream/aes256estream/stream_aes256estream_api.c \
151
- @MINIMAL_FALSE@ crypto_stream/aes256estream/hongjun/api.h \
152
- @MINIMAL_FALSE@ crypto_stream/aes256estream/hongjun/ecrypt-sync.h \
153
145
  @MINIMAL_FALSE@ crypto_stream/salsa2012/stream_salsa2012_api.c \
154
146
  @MINIMAL_FALSE@ crypto_stream/salsa2012/ref/api.h \
155
147
  @MINIMAL_FALSE@ crypto_stream/salsa2012/ref/stream_salsa2012.c \
@@ -157,8 +149,7 @@ host_triplet = @host@
157
149
  @MINIMAL_FALSE@ crypto_stream/salsa208/stream_salsa208_api.c \
158
150
  @MINIMAL_FALSE@ crypto_stream/salsa208/ref/api.h \
159
151
  @MINIMAL_FALSE@ crypto_stream/salsa208/ref/stream_salsa208.c \
160
- @MINIMAL_FALSE@ crypto_stream/salsa208/ref/xor_salsa208.c \
161
- @MINIMAL_FALSE@ sodium/compat.c
152
+ @MINIMAL_FALSE@ crypto_stream/salsa208/ref/xor_salsa208.c
162
153
 
163
154
  @HAVE_LD_OUTPUT_DEF_TRUE@am__append_6 = -Wl,--output-def,libsodium-$(DLL_VERSION).def
164
155
  subdir = src/libsodium
@@ -402,14 +393,6 @@ am__libsodium_la_SOURCES_DIST = \
402
393
  crypto_stream/aes128ctr/portable/stream_aes128ctr.c \
403
394
  crypto_stream/aes128ctr/portable/types.h \
404
395
  crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c \
405
- crypto_stream/aes256estream/hongjun/aes-table.h \
406
- crypto_stream/aes256estream/hongjun/aes-table-be.h \
407
- crypto_stream/aes256estream/hongjun/aes-table-le.h \
408
- crypto_stream/aes256estream/hongjun/aes256-ctr.c \
409
- crypto_stream/aes256estream/hongjun/aes256.h \
410
- crypto_stream/aes256estream/stream_aes256estream_api.c \
411
- crypto_stream/aes256estream/hongjun/api.h \
412
- crypto_stream/aes256estream/hongjun/ecrypt-sync.h \
413
396
  crypto_stream/salsa2012/stream_salsa2012_api.c \
414
397
  crypto_stream/salsa2012/ref/api.h \
415
398
  crypto_stream/salsa2012/ref/stream_salsa2012.c \
@@ -417,7 +400,7 @@ am__libsodium_la_SOURCES_DIST = \
417
400
  crypto_stream/salsa208/stream_salsa208_api.c \
418
401
  crypto_stream/salsa208/ref/api.h \
419
402
  crypto_stream/salsa208/ref/stream_salsa208.c \
420
- crypto_stream/salsa208/ref/xor_salsa208.c sodium/compat.c
403
+ crypto_stream/salsa208/ref/xor_salsa208.c
421
404
  am__dirstamp = $(am__leading_dot)dirstamp
422
405
  @HAVE_TI_MODE_TRUE@am__objects_1 = crypto_scalarmult/curve25519/donna_c64/libsodium_la-base_curve25519_donna_c64.lo \
423
406
  @HAVE_TI_MODE_TRUE@ crypto_scalarmult/curve25519/donna_c64/libsodium_la-smult_curve25519_donna_c64.lo
@@ -455,15 +438,12 @@ am__dirstamp = $(am__leading_dot)dirstamp
455
438
  @MINIMAL_FALSE@ crypto_stream/aes128ctr/portable/libsodium_la-int128_aes128ctr.lo \
456
439
  @MINIMAL_FALSE@ crypto_stream/aes128ctr/portable/libsodium_la-stream_aes128ctr.lo \
457
440
  @MINIMAL_FALSE@ crypto_stream/aes128ctr/portable/libsodium_la-xor_afternm_aes128ctr.lo \
458
- @MINIMAL_FALSE@ crypto_stream/aes256estream/hongjun/libsodium_la-aes256-ctr.lo \
459
- @MINIMAL_FALSE@ crypto_stream/aes256estream/libsodium_la-stream_aes256estream_api.lo \
460
441
  @MINIMAL_FALSE@ crypto_stream/salsa2012/libsodium_la-stream_salsa2012_api.lo \
461
442
  @MINIMAL_FALSE@ crypto_stream/salsa2012/ref/libsodium_la-stream_salsa2012.lo \
462
443
  @MINIMAL_FALSE@ crypto_stream/salsa2012/ref/libsodium_la-xor_salsa2012.lo \
463
444
  @MINIMAL_FALSE@ crypto_stream/salsa208/libsodium_la-stream_salsa208_api.lo \
464
445
  @MINIMAL_FALSE@ crypto_stream/salsa208/ref/libsodium_la-stream_salsa208.lo \
465
- @MINIMAL_FALSE@ crypto_stream/salsa208/ref/libsodium_la-xor_salsa208.lo \
466
- @MINIMAL_FALSE@ sodium/libsodium_la-compat.lo
446
+ @MINIMAL_FALSE@ crypto_stream/salsa208/ref/libsodium_la-xor_salsa208.lo
467
447
  am_libsodium_la_OBJECTS = crypto_aead/chacha20poly1305/sodium/libsodium_la-aead_chacha20poly1305.lo \
468
448
  crypto_auth/libsodium_la-crypto_auth.lo \
469
449
  crypto_auth/hmacsha256/libsodium_la-auth_hmacsha256_api.lo \
@@ -1905,24 +1885,6 @@ crypto_stream/aes128ctr/portable/libsodium_la-stream_aes128ctr.lo: \
1905
1885
  crypto_stream/aes128ctr/portable/libsodium_la-xor_afternm_aes128ctr.lo: \
1906
1886
  crypto_stream/aes128ctr/portable/$(am__dirstamp) \
1907
1887
  crypto_stream/aes128ctr/portable/$(DEPDIR)/$(am__dirstamp)
1908
- crypto_stream/aes256estream/hongjun/$(am__dirstamp):
1909
- @$(MKDIR_P) crypto_stream/aes256estream/hongjun
1910
- @: > crypto_stream/aes256estream/hongjun/$(am__dirstamp)
1911
- crypto_stream/aes256estream/hongjun/$(DEPDIR)/$(am__dirstamp):
1912
- @$(MKDIR_P) crypto_stream/aes256estream/hongjun/$(DEPDIR)
1913
- @: > crypto_stream/aes256estream/hongjun/$(DEPDIR)/$(am__dirstamp)
1914
- crypto_stream/aes256estream/hongjun/libsodium_la-aes256-ctr.lo: \
1915
- crypto_stream/aes256estream/hongjun/$(am__dirstamp) \
1916
- crypto_stream/aes256estream/hongjun/$(DEPDIR)/$(am__dirstamp)
1917
- crypto_stream/aes256estream/$(am__dirstamp):
1918
- @$(MKDIR_P) crypto_stream/aes256estream
1919
- @: > crypto_stream/aes256estream/$(am__dirstamp)
1920
- crypto_stream/aes256estream/$(DEPDIR)/$(am__dirstamp):
1921
- @$(MKDIR_P) crypto_stream/aes256estream/$(DEPDIR)
1922
- @: > crypto_stream/aes256estream/$(DEPDIR)/$(am__dirstamp)
1923
- crypto_stream/aes256estream/libsodium_la-stream_aes256estream_api.lo: \
1924
- crypto_stream/aes256estream/$(am__dirstamp) \
1925
- crypto_stream/aes256estream/$(DEPDIR)/$(am__dirstamp)
1926
1888
  crypto_stream/salsa2012/$(am__dirstamp):
1927
1889
  @$(MKDIR_P) crypto_stream/salsa2012
1928
1890
  @: > crypto_stream/salsa2012/$(am__dirstamp)
@@ -1965,8 +1927,6 @@ crypto_stream/salsa208/ref/libsodium_la-stream_salsa208.lo: \
1965
1927
  crypto_stream/salsa208/ref/libsodium_la-xor_salsa208.lo: \
1966
1928
  crypto_stream/salsa208/ref/$(am__dirstamp) \
1967
1929
  crypto_stream/salsa208/ref/$(DEPDIR)/$(am__dirstamp)
1968
- sodium/libsodium_la-compat.lo: sodium/$(am__dirstamp) \
1969
- sodium/$(DEPDIR)/$(am__dirstamp)
1970
1930
 
1971
1931
  libsodium.la: $(libsodium_la_OBJECTS) $(libsodium_la_DEPENDENCIES) $(EXTRA_libsodium_la_DEPENDENCIES)
1972
1932
  $(AM_V_CCLD)$(libsodium_la_LINK) -rpath $(libdir) $(libsodium_la_OBJECTS) $(libsodium_la_LIBADD) $(LIBS)
@@ -2075,10 +2035,6 @@ mostlyclean-compile:
2075
2035
  -rm -f crypto_stream/aes128ctr/*.lo
2076
2036
  -rm -f crypto_stream/aes128ctr/portable/*.$(OBJEXT)
2077
2037
  -rm -f crypto_stream/aes128ctr/portable/*.lo
2078
- -rm -f crypto_stream/aes256estream/*.$(OBJEXT)
2079
- -rm -f crypto_stream/aes256estream/*.lo
2080
- -rm -f crypto_stream/aes256estream/hongjun/*.$(OBJEXT)
2081
- -rm -f crypto_stream/aes256estream/hongjun/*.lo
2082
2038
  -rm -f crypto_stream/chacha20/*.$(OBJEXT)
2083
2039
  -rm -f crypto_stream/chacha20/*.lo
2084
2040
  -rm -f crypto_stream/chacha20/ref/*.$(OBJEXT)
@@ -2252,8 +2208,6 @@ distclean-compile:
2252
2208
  @AMDEP_TRUE@@am__include@ @am__quote@crypto_stream/aes128ctr/portable/$(DEPDIR)/libsodium_la-int128_aes128ctr.Plo@am__quote@
2253
2209
  @AMDEP_TRUE@@am__include@ @am__quote@crypto_stream/aes128ctr/portable/$(DEPDIR)/libsodium_la-stream_aes128ctr.Plo@am__quote@
2254
2210
  @AMDEP_TRUE@@am__include@ @am__quote@crypto_stream/aes128ctr/portable/$(DEPDIR)/libsodium_la-xor_afternm_aes128ctr.Plo@am__quote@
2255
- @AMDEP_TRUE@@am__include@ @am__quote@crypto_stream/aes256estream/$(DEPDIR)/libsodium_la-stream_aes256estream_api.Plo@am__quote@
2256
- @AMDEP_TRUE@@am__include@ @am__quote@crypto_stream/aes256estream/hongjun/$(DEPDIR)/libsodium_la-aes256-ctr.Plo@am__quote@
2257
2211
  @AMDEP_TRUE@@am__include@ @am__quote@crypto_stream/chacha20/$(DEPDIR)/libsodium_la-stream_chacha20_api.Plo@am__quote@
2258
2212
  @AMDEP_TRUE@@am__include@ @am__quote@crypto_stream/chacha20/ref/$(DEPDIR)/libsodium_la-stream_chacha20_ref.Plo@am__quote@
2259
2213
  @AMDEP_TRUE@@am__include@ @am__quote@crypto_stream/salsa20/$(DEPDIR)/libsodium_la-stream_salsa20_api.Plo@am__quote@
@@ -2278,7 +2232,6 @@ distclean-compile:
2278
2232
  @AMDEP_TRUE@@am__include@ @am__quote@randombytes/$(DEPDIR)/libsodium_la-randombytes.Plo@am__quote@
2279
2233
  @AMDEP_TRUE@@am__include@ @am__quote@randombytes/salsa20/$(DEPDIR)/libsodium_la-randombytes_salsa20_random.Plo@am__quote@
2280
2234
  @AMDEP_TRUE@@am__include@ @am__quote@randombytes/sysrandom/$(DEPDIR)/libsodium_la-randombytes_sysrandom.Plo@am__quote@
2281
- @AMDEP_TRUE@@am__include@ @am__quote@sodium/$(DEPDIR)/libsodium_la-compat.Plo@am__quote@
2282
2235
  @AMDEP_TRUE@@am__include@ @am__quote@sodium/$(DEPDIR)/libsodium_la-core.Plo@am__quote@
2283
2236
  @AMDEP_TRUE@@am__include@ @am__quote@sodium/$(DEPDIR)/libsodium_la-runtime.Plo@am__quote@
2284
2237
  @AMDEP_TRUE@@am__include@ @am__quote@sodium/$(DEPDIR)/libsodium_la-utils.Plo@am__quote@
@@ -3375,20 +3328,6 @@ crypto_stream/aes128ctr/portable/libsodium_la-xor_afternm_aes128ctr.lo: crypto_s
3375
3328
  @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
3376
3329
  @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_stream/aes128ctr/portable/libsodium_la-xor_afternm_aes128ctr.lo `test -f 'crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c' || echo '$(srcdir)/'`crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c
3377
3330
 
3378
- crypto_stream/aes256estream/hongjun/libsodium_la-aes256-ctr.lo: crypto_stream/aes256estream/hongjun/aes256-ctr.c
3379
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_stream/aes256estream/hongjun/libsodium_la-aes256-ctr.lo -MD -MP -MF crypto_stream/aes256estream/hongjun/$(DEPDIR)/libsodium_la-aes256-ctr.Tpo -c -o crypto_stream/aes256estream/hongjun/libsodium_la-aes256-ctr.lo `test -f 'crypto_stream/aes256estream/hongjun/aes256-ctr.c' || echo '$(srcdir)/'`crypto_stream/aes256estream/hongjun/aes256-ctr.c
3380
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_stream/aes256estream/hongjun/$(DEPDIR)/libsodium_la-aes256-ctr.Tpo crypto_stream/aes256estream/hongjun/$(DEPDIR)/libsodium_la-aes256-ctr.Plo
3381
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_stream/aes256estream/hongjun/aes256-ctr.c' object='crypto_stream/aes256estream/hongjun/libsodium_la-aes256-ctr.lo' libtool=yes @AMDEPBACKSLASH@
3382
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
3383
- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_stream/aes256estream/hongjun/libsodium_la-aes256-ctr.lo `test -f 'crypto_stream/aes256estream/hongjun/aes256-ctr.c' || echo '$(srcdir)/'`crypto_stream/aes256estream/hongjun/aes256-ctr.c
3384
-
3385
- crypto_stream/aes256estream/libsodium_la-stream_aes256estream_api.lo: crypto_stream/aes256estream/stream_aes256estream_api.c
3386
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_stream/aes256estream/libsodium_la-stream_aes256estream_api.lo -MD -MP -MF crypto_stream/aes256estream/$(DEPDIR)/libsodium_la-stream_aes256estream_api.Tpo -c -o crypto_stream/aes256estream/libsodium_la-stream_aes256estream_api.lo `test -f 'crypto_stream/aes256estream/stream_aes256estream_api.c' || echo '$(srcdir)/'`crypto_stream/aes256estream/stream_aes256estream_api.c
3387
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_stream/aes256estream/$(DEPDIR)/libsodium_la-stream_aes256estream_api.Tpo crypto_stream/aes256estream/$(DEPDIR)/libsodium_la-stream_aes256estream_api.Plo
3388
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_stream/aes256estream/stream_aes256estream_api.c' object='crypto_stream/aes256estream/libsodium_la-stream_aes256estream_api.lo' libtool=yes @AMDEPBACKSLASH@
3389
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
3390
- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_stream/aes256estream/libsodium_la-stream_aes256estream_api.lo `test -f 'crypto_stream/aes256estream/stream_aes256estream_api.c' || echo '$(srcdir)/'`crypto_stream/aes256estream/stream_aes256estream_api.c
3391
-
3392
3331
  crypto_stream/salsa2012/libsodium_la-stream_salsa2012_api.lo: crypto_stream/salsa2012/stream_salsa2012_api.c
3393
3332
  @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_stream/salsa2012/libsodium_la-stream_salsa2012_api.lo -MD -MP -MF crypto_stream/salsa2012/$(DEPDIR)/libsodium_la-stream_salsa2012_api.Tpo -c -o crypto_stream/salsa2012/libsodium_la-stream_salsa2012_api.lo `test -f 'crypto_stream/salsa2012/stream_salsa2012_api.c' || echo '$(srcdir)/'`crypto_stream/salsa2012/stream_salsa2012_api.c
3394
3333
  @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_stream/salsa2012/$(DEPDIR)/libsodium_la-stream_salsa2012_api.Tpo crypto_stream/salsa2012/$(DEPDIR)/libsodium_la-stream_salsa2012_api.Plo
@@ -3431,13 +3370,6 @@ crypto_stream/salsa208/ref/libsodium_la-xor_salsa208.lo: crypto_stream/salsa208/
3431
3370
  @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
3432
3371
  @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_stream/salsa208/ref/libsodium_la-xor_salsa208.lo `test -f 'crypto_stream/salsa208/ref/xor_salsa208.c' || echo '$(srcdir)/'`crypto_stream/salsa208/ref/xor_salsa208.c
3433
3372
 
3434
- sodium/libsodium_la-compat.lo: sodium/compat.c
3435
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sodium/libsodium_la-compat.lo -MD -MP -MF sodium/$(DEPDIR)/libsodium_la-compat.Tpo -c -o sodium/libsodium_la-compat.lo `test -f 'sodium/compat.c' || echo '$(srcdir)/'`sodium/compat.c
3436
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) sodium/$(DEPDIR)/libsodium_la-compat.Tpo sodium/$(DEPDIR)/libsodium_la-compat.Plo
3437
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sodium/compat.c' object='sodium/libsodium_la-compat.lo' libtool=yes @AMDEPBACKSLASH@
3438
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
3439
- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sodium/libsodium_la-compat.lo `test -f 'sodium/compat.c' || echo '$(srcdir)/'`sodium/compat.c
3440
-
3441
3373
  mostlyclean-libtool:
3442
3374
  -rm -f *.lo
3443
3375
 
@@ -3494,8 +3426,6 @@ clean-libtool:
3494
3426
  -rm -rf crypto_stream/.libs crypto_stream/_libs
3495
3427
  -rm -rf crypto_stream/aes128ctr/.libs crypto_stream/aes128ctr/_libs
3496
3428
  -rm -rf crypto_stream/aes128ctr/portable/.libs crypto_stream/aes128ctr/portable/_libs
3497
- -rm -rf crypto_stream/aes256estream/.libs crypto_stream/aes256estream/_libs
3498
- -rm -rf crypto_stream/aes256estream/hongjun/.libs crypto_stream/aes256estream/hongjun/_libs
3499
3429
  -rm -rf crypto_stream/chacha20/.libs crypto_stream/chacha20/_libs
3500
3430
  -rm -rf crypto_stream/chacha20/ref/.libs crypto_stream/chacha20/ref/_libs
3501
3431
  -rm -rf crypto_stream/salsa20/.libs crypto_stream/salsa20/_libs
@@ -3830,10 +3760,6 @@ distclean-generic:
3830
3760
  -rm -f crypto_stream/aes128ctr/$(am__dirstamp)
3831
3761
  -rm -f crypto_stream/aes128ctr/portable/$(DEPDIR)/$(am__dirstamp)
3832
3762
  -rm -f crypto_stream/aes128ctr/portable/$(am__dirstamp)
3833
- -rm -f crypto_stream/aes256estream/$(DEPDIR)/$(am__dirstamp)
3834
- -rm -f crypto_stream/aes256estream/$(am__dirstamp)
3835
- -rm -f crypto_stream/aes256estream/hongjun/$(DEPDIR)/$(am__dirstamp)
3836
- -rm -f crypto_stream/aes256estream/hongjun/$(am__dirstamp)
3837
3763
  -rm -f crypto_stream/chacha20/$(DEPDIR)/$(am__dirstamp)
3838
3764
  -rm -f crypto_stream/chacha20/$(am__dirstamp)
3839
3765
  -rm -f crypto_stream/chacha20/ref/$(DEPDIR)/$(am__dirstamp)
@@ -3886,7 +3812,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
3886
3812
  mostlyclean-am
3887
3813
 
3888
3814
  distclean: distclean-recursive
3889
- -rm -rf crypto_aead/chacha20poly1305/sodium/$(DEPDIR) crypto_auth/$(DEPDIR) crypto_auth/hmacsha256/$(DEPDIR) crypto_auth/hmacsha256/cp/$(DEPDIR) crypto_auth/hmacsha512/$(DEPDIR) crypto_auth/hmacsha512/cp/$(DEPDIR) crypto_auth/hmacsha512256/$(DEPDIR) crypto_auth/hmacsha512256/cp/$(DEPDIR) crypto_box/$(DEPDIR) crypto_box/curve25519xsalsa20poly1305/$(DEPDIR) crypto_box/curve25519xsalsa20poly1305/ref/$(DEPDIR) crypto_core/hsalsa20/$(DEPDIR) crypto_core/hsalsa20/ref2/$(DEPDIR) crypto_core/salsa20/$(DEPDIR) crypto_core/salsa20/ref/$(DEPDIR) crypto_core/salsa2012/$(DEPDIR) crypto_core/salsa2012/ref/$(DEPDIR) crypto_core/salsa208/$(DEPDIR) crypto_core/salsa208/ref/$(DEPDIR) crypto_generichash/$(DEPDIR) crypto_generichash/blake2/$(DEPDIR) crypto_generichash/blake2/ref/$(DEPDIR) crypto_hash/$(DEPDIR) crypto_hash/sha256/$(DEPDIR) crypto_hash/sha256/cp/$(DEPDIR) crypto_hash/sha512/$(DEPDIR) crypto_hash/sha512/cp/$(DEPDIR) crypto_onetimeauth/$(DEPDIR) crypto_onetimeauth/poly1305/$(DEPDIR) crypto_onetimeauth/poly1305/donna/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/nosse/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/sse/$(DEPDIR) crypto_scalarmult/$(DEPDIR) crypto_scalarmult/curve25519/$(DEPDIR) crypto_scalarmult/curve25519/donna_c64/$(DEPDIR) crypto_scalarmult/curve25519/ref10/$(DEPDIR) crypto_secretbox/$(DEPDIR) crypto_secretbox/xsalsa20poly1305/$(DEPDIR) crypto_secretbox/xsalsa20poly1305/ref/$(DEPDIR) crypto_shorthash/$(DEPDIR) crypto_shorthash/siphash24/$(DEPDIR) crypto_shorthash/siphash24/ref/$(DEPDIR) crypto_sign/$(DEPDIR) crypto_sign/ed25519/$(DEPDIR) crypto_sign/ed25519/ref10/$(DEPDIR) crypto_sign/edwards25519sha512batch/$(DEPDIR) crypto_sign/edwards25519sha512batch/ref/$(DEPDIR) crypto_stream/$(DEPDIR) crypto_stream/aes128ctr/$(DEPDIR) crypto_stream/aes128ctr/portable/$(DEPDIR) crypto_stream/aes256estream/$(DEPDIR) crypto_stream/aes256estream/hongjun/$(DEPDIR) crypto_stream/chacha20/$(DEPDIR) crypto_stream/chacha20/ref/$(DEPDIR) crypto_stream/salsa20/$(DEPDIR) crypto_stream/salsa20/amd64_xmm6/$(DEPDIR) crypto_stream/salsa20/ref/$(DEPDIR) crypto_stream/salsa2012/$(DEPDIR) crypto_stream/salsa2012/ref/$(DEPDIR) crypto_stream/salsa208/$(DEPDIR) crypto_stream/salsa208/ref/$(DEPDIR) crypto_stream/xsalsa20/$(DEPDIR) crypto_stream/xsalsa20/ref/$(DEPDIR) crypto_verify/16/$(DEPDIR) crypto_verify/16/ref/$(DEPDIR) crypto_verify/32/$(DEPDIR) crypto_verify/32/ref/$(DEPDIR) crypto_verify/64/$(DEPDIR) crypto_verify/64/ref/$(DEPDIR) randombytes/$(DEPDIR) randombytes/salsa20/$(DEPDIR) randombytes/sysrandom/$(DEPDIR) sodium/$(DEPDIR)
3815
+ -rm -rf crypto_aead/chacha20poly1305/sodium/$(DEPDIR) crypto_auth/$(DEPDIR) crypto_auth/hmacsha256/$(DEPDIR) crypto_auth/hmacsha256/cp/$(DEPDIR) crypto_auth/hmacsha512/$(DEPDIR) crypto_auth/hmacsha512/cp/$(DEPDIR) crypto_auth/hmacsha512256/$(DEPDIR) crypto_auth/hmacsha512256/cp/$(DEPDIR) crypto_box/$(DEPDIR) crypto_box/curve25519xsalsa20poly1305/$(DEPDIR) crypto_box/curve25519xsalsa20poly1305/ref/$(DEPDIR) crypto_core/hsalsa20/$(DEPDIR) crypto_core/hsalsa20/ref2/$(DEPDIR) crypto_core/salsa20/$(DEPDIR) crypto_core/salsa20/ref/$(DEPDIR) crypto_core/salsa2012/$(DEPDIR) crypto_core/salsa2012/ref/$(DEPDIR) crypto_core/salsa208/$(DEPDIR) crypto_core/salsa208/ref/$(DEPDIR) crypto_generichash/$(DEPDIR) crypto_generichash/blake2/$(DEPDIR) crypto_generichash/blake2/ref/$(DEPDIR) crypto_hash/$(DEPDIR) crypto_hash/sha256/$(DEPDIR) crypto_hash/sha256/cp/$(DEPDIR) crypto_hash/sha512/$(DEPDIR) crypto_hash/sha512/cp/$(DEPDIR) crypto_onetimeauth/$(DEPDIR) crypto_onetimeauth/poly1305/$(DEPDIR) crypto_onetimeauth/poly1305/donna/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/nosse/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/sse/$(DEPDIR) crypto_scalarmult/$(DEPDIR) crypto_scalarmult/curve25519/$(DEPDIR) crypto_scalarmult/curve25519/donna_c64/$(DEPDIR) crypto_scalarmult/curve25519/ref10/$(DEPDIR) crypto_secretbox/$(DEPDIR) crypto_secretbox/xsalsa20poly1305/$(DEPDIR) crypto_secretbox/xsalsa20poly1305/ref/$(DEPDIR) crypto_shorthash/$(DEPDIR) crypto_shorthash/siphash24/$(DEPDIR) crypto_shorthash/siphash24/ref/$(DEPDIR) crypto_sign/$(DEPDIR) crypto_sign/ed25519/$(DEPDIR) crypto_sign/ed25519/ref10/$(DEPDIR) crypto_sign/edwards25519sha512batch/$(DEPDIR) crypto_sign/edwards25519sha512batch/ref/$(DEPDIR) crypto_stream/$(DEPDIR) crypto_stream/aes128ctr/$(DEPDIR) crypto_stream/aes128ctr/portable/$(DEPDIR) crypto_stream/chacha20/$(DEPDIR) crypto_stream/chacha20/ref/$(DEPDIR) crypto_stream/salsa20/$(DEPDIR) crypto_stream/salsa20/amd64_xmm6/$(DEPDIR) crypto_stream/salsa20/ref/$(DEPDIR) crypto_stream/salsa2012/$(DEPDIR) crypto_stream/salsa2012/ref/$(DEPDIR) crypto_stream/salsa208/$(DEPDIR) crypto_stream/salsa208/ref/$(DEPDIR) crypto_stream/xsalsa20/$(DEPDIR) crypto_stream/xsalsa20/ref/$(DEPDIR) crypto_verify/16/$(DEPDIR) crypto_verify/16/ref/$(DEPDIR) crypto_verify/32/$(DEPDIR) crypto_verify/32/ref/$(DEPDIR) crypto_verify/64/$(DEPDIR) crypto_verify/64/ref/$(DEPDIR) randombytes/$(DEPDIR) randombytes/salsa20/$(DEPDIR) randombytes/sysrandom/$(DEPDIR) sodium/$(DEPDIR)
3890
3816
  -rm -f Makefile
3891
3817
  distclean-am: clean-am distclean-compile distclean-generic \
3892
3818
  distclean-tags
@@ -3932,7 +3858,7 @@ install-ps-am:
3932
3858
  installcheck-am:
3933
3859
 
3934
3860
  maintainer-clean: maintainer-clean-recursive
3935
- -rm -rf crypto_aead/chacha20poly1305/sodium/$(DEPDIR) crypto_auth/$(DEPDIR) crypto_auth/hmacsha256/$(DEPDIR) crypto_auth/hmacsha256/cp/$(DEPDIR) crypto_auth/hmacsha512/$(DEPDIR) crypto_auth/hmacsha512/cp/$(DEPDIR) crypto_auth/hmacsha512256/$(DEPDIR) crypto_auth/hmacsha512256/cp/$(DEPDIR) crypto_box/$(DEPDIR) crypto_box/curve25519xsalsa20poly1305/$(DEPDIR) crypto_box/curve25519xsalsa20poly1305/ref/$(DEPDIR) crypto_core/hsalsa20/$(DEPDIR) crypto_core/hsalsa20/ref2/$(DEPDIR) crypto_core/salsa20/$(DEPDIR) crypto_core/salsa20/ref/$(DEPDIR) crypto_core/salsa2012/$(DEPDIR) crypto_core/salsa2012/ref/$(DEPDIR) crypto_core/salsa208/$(DEPDIR) crypto_core/salsa208/ref/$(DEPDIR) crypto_generichash/$(DEPDIR) crypto_generichash/blake2/$(DEPDIR) crypto_generichash/blake2/ref/$(DEPDIR) crypto_hash/$(DEPDIR) crypto_hash/sha256/$(DEPDIR) crypto_hash/sha256/cp/$(DEPDIR) crypto_hash/sha512/$(DEPDIR) crypto_hash/sha512/cp/$(DEPDIR) crypto_onetimeauth/$(DEPDIR) crypto_onetimeauth/poly1305/$(DEPDIR) crypto_onetimeauth/poly1305/donna/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/nosse/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/sse/$(DEPDIR) crypto_scalarmult/$(DEPDIR) crypto_scalarmult/curve25519/$(DEPDIR) crypto_scalarmult/curve25519/donna_c64/$(DEPDIR) crypto_scalarmult/curve25519/ref10/$(DEPDIR) crypto_secretbox/$(DEPDIR) crypto_secretbox/xsalsa20poly1305/$(DEPDIR) crypto_secretbox/xsalsa20poly1305/ref/$(DEPDIR) crypto_shorthash/$(DEPDIR) crypto_shorthash/siphash24/$(DEPDIR) crypto_shorthash/siphash24/ref/$(DEPDIR) crypto_sign/$(DEPDIR) crypto_sign/ed25519/$(DEPDIR) crypto_sign/ed25519/ref10/$(DEPDIR) crypto_sign/edwards25519sha512batch/$(DEPDIR) crypto_sign/edwards25519sha512batch/ref/$(DEPDIR) crypto_stream/$(DEPDIR) crypto_stream/aes128ctr/$(DEPDIR) crypto_stream/aes128ctr/portable/$(DEPDIR) crypto_stream/aes256estream/$(DEPDIR) crypto_stream/aes256estream/hongjun/$(DEPDIR) crypto_stream/chacha20/$(DEPDIR) crypto_stream/chacha20/ref/$(DEPDIR) crypto_stream/salsa20/$(DEPDIR) crypto_stream/salsa20/amd64_xmm6/$(DEPDIR) crypto_stream/salsa20/ref/$(DEPDIR) crypto_stream/salsa2012/$(DEPDIR) crypto_stream/salsa2012/ref/$(DEPDIR) crypto_stream/salsa208/$(DEPDIR) crypto_stream/salsa208/ref/$(DEPDIR) crypto_stream/xsalsa20/$(DEPDIR) crypto_stream/xsalsa20/ref/$(DEPDIR) crypto_verify/16/$(DEPDIR) crypto_verify/16/ref/$(DEPDIR) crypto_verify/32/$(DEPDIR) crypto_verify/32/ref/$(DEPDIR) crypto_verify/64/$(DEPDIR) crypto_verify/64/ref/$(DEPDIR) randombytes/$(DEPDIR) randombytes/salsa20/$(DEPDIR) randombytes/sysrandom/$(DEPDIR) sodium/$(DEPDIR)
3861
+ -rm -rf crypto_aead/chacha20poly1305/sodium/$(DEPDIR) crypto_auth/$(DEPDIR) crypto_auth/hmacsha256/$(DEPDIR) crypto_auth/hmacsha256/cp/$(DEPDIR) crypto_auth/hmacsha512/$(DEPDIR) crypto_auth/hmacsha512/cp/$(DEPDIR) crypto_auth/hmacsha512256/$(DEPDIR) crypto_auth/hmacsha512256/cp/$(DEPDIR) crypto_box/$(DEPDIR) crypto_box/curve25519xsalsa20poly1305/$(DEPDIR) crypto_box/curve25519xsalsa20poly1305/ref/$(DEPDIR) crypto_core/hsalsa20/$(DEPDIR) crypto_core/hsalsa20/ref2/$(DEPDIR) crypto_core/salsa20/$(DEPDIR) crypto_core/salsa20/ref/$(DEPDIR) crypto_core/salsa2012/$(DEPDIR) crypto_core/salsa2012/ref/$(DEPDIR) crypto_core/salsa208/$(DEPDIR) crypto_core/salsa208/ref/$(DEPDIR) crypto_generichash/$(DEPDIR) crypto_generichash/blake2/$(DEPDIR) crypto_generichash/blake2/ref/$(DEPDIR) crypto_hash/$(DEPDIR) crypto_hash/sha256/$(DEPDIR) crypto_hash/sha256/cp/$(DEPDIR) crypto_hash/sha512/$(DEPDIR) crypto_hash/sha512/cp/$(DEPDIR) crypto_onetimeauth/$(DEPDIR) crypto_onetimeauth/poly1305/$(DEPDIR) crypto_onetimeauth/poly1305/donna/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/nosse/$(DEPDIR) crypto_pwhash/scryptsalsa208sha256/sse/$(DEPDIR) crypto_scalarmult/$(DEPDIR) crypto_scalarmult/curve25519/$(DEPDIR) crypto_scalarmult/curve25519/donna_c64/$(DEPDIR) crypto_scalarmult/curve25519/ref10/$(DEPDIR) crypto_secretbox/$(DEPDIR) crypto_secretbox/xsalsa20poly1305/$(DEPDIR) crypto_secretbox/xsalsa20poly1305/ref/$(DEPDIR) crypto_shorthash/$(DEPDIR) crypto_shorthash/siphash24/$(DEPDIR) crypto_shorthash/siphash24/ref/$(DEPDIR) crypto_sign/$(DEPDIR) crypto_sign/ed25519/$(DEPDIR) crypto_sign/ed25519/ref10/$(DEPDIR) crypto_sign/edwards25519sha512batch/$(DEPDIR) crypto_sign/edwards25519sha512batch/ref/$(DEPDIR) crypto_stream/$(DEPDIR) crypto_stream/aes128ctr/$(DEPDIR) crypto_stream/aes128ctr/portable/$(DEPDIR) crypto_stream/chacha20/$(DEPDIR) crypto_stream/chacha20/ref/$(DEPDIR) crypto_stream/salsa20/$(DEPDIR) crypto_stream/salsa20/amd64_xmm6/$(DEPDIR) crypto_stream/salsa20/ref/$(DEPDIR) crypto_stream/salsa2012/$(DEPDIR) crypto_stream/salsa2012/ref/$(DEPDIR) crypto_stream/salsa208/$(DEPDIR) crypto_stream/salsa208/ref/$(DEPDIR) crypto_stream/xsalsa20/$(DEPDIR) crypto_stream/xsalsa20/ref/$(DEPDIR) crypto_verify/16/$(DEPDIR) crypto_verify/16/ref/$(DEPDIR) crypto_verify/32/$(DEPDIR) crypto_verify/32/ref/$(DEPDIR) crypto_verify/64/$(DEPDIR) crypto_verify/64/ref/$(DEPDIR) randombytes/$(DEPDIR) randombytes/salsa20/$(DEPDIR) randombytes/sysrandom/$(DEPDIR) sodium/$(DEPDIR)
3936
3862
  -rm -f Makefile
3937
3863
  maintainer-clean-am: distclean-am maintainer-clean-generic
3938
3864