rbnacl-libsodium 1.0.9 → 1.0.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (58) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGES.md +5 -0
  3. data/lib/rbnacl/libsodium.rb +5 -5
  4. data/lib/rbnacl/libsodium/version.rb +1 -1
  5. data/rbnacl-libsodium.gemspec +5 -4
  6. data/vendor/libsodium/ChangeLog +4 -0
  7. data/vendor/libsodium/appveyor.yml +1 -1
  8. data/vendor/libsodium/autom4te.cache/output.1 +38 -10
  9. data/vendor/libsodium/autom4te.cache/output.6 +38 -10
  10. data/vendor/libsodium/autom4te.cache/requests +1035 -1035
  11. data/vendor/libsodium/autom4te.cache/traces.1 +212 -208
  12. data/vendor/libsodium/autom4te.cache/traces.6 +101 -100
  13. data/vendor/libsodium/builds/msvc/version.h +1 -1
  14. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj +0 -22
  15. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +0 -66
  16. data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj +0 -22
  17. data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +0 -66
  18. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj +0 -22
  19. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +0 -66
  20. data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.vcxproj +0 -22
  21. data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters +0 -66
  22. data/vendor/libsodium/configure +38 -10
  23. data/vendor/libsodium/configure.ac +12 -2
  24. data/vendor/libsodium/dist-build/emscripten.sh +1 -1
  25. data/vendor/libsodium/msvc-scripts/process.bat +1 -1
  26. data/vendor/libsodium/src/libsodium/Makefile.am +4 -4
  27. data/vendor/libsodium/src/libsodium/Makefile.in +53 -49
  28. data/vendor/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c +1 -1
  29. data/vendor/libsodium/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c +1 -1
  30. data/vendor/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c +1 -1
  31. data/vendor/libsodium/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c +1 -1
  32. data/vendor/libsodium/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c +1 -1
  33. data/vendor/libsodium/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c +1 -1
  34. data/vendor/libsodium/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c +1 -1
  35. data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c +1 -1
  36. data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c +3 -1
  37. data/vendor/libsodium/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c +1 -1
  38. data/vendor/libsodium/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c +1 -1
  39. data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h +1 -1
  40. data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h +1 -1
  41. data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-core.c +1 -1
  42. data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/blake2b-long.c +1 -1
  43. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c +1 -1
  44. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c +1 -1
  45. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c +1 -1
  46. data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c +1 -1
  47. data/vendor/libsodium/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c +1 -1
  48. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/keypair.c +1 -1
  49. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c +1 -1
  50. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c +1 -1
  51. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c +1 -1
  52. data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/common.h +1 -1
  53. data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c +1 -1
  54. data/vendor/libsodium/src/libsodium/{sodium → include/sodium/private}/common.h +0 -0
  55. data/vendor/libsodium/src/libsodium/{crypto_core/curve25519/ref10 → include/sodium/private}/curve25519_ref10.h +0 -0
  56. data/vendor/libsodium/test/default/aead_aes256gcm.c +1 -1
  57. data/vendor/libsodium/test/default/aead_chacha20poly1305.c +7 -5
  58. metadata +8 -12
data/vendor/libsodium/src/libsodium/Makefile.in CHANGED
@@ -243,7 +243,6 @@ am__libsodium_la_SOURCES_DIST = \
243
243
  crypto_core/curve25519/ref10/base.h \
244
244
  crypto_core/curve25519/ref10/base2.h \
245
245
  crypto_core/curve25519/ref10/curve25519_ref10.c \
246
- crypto_core/curve25519/ref10/curve25519_ref10.h \
247
246
  crypto_core/hsalsa20/ref2/core_hsalsa20.c \
248
247
  crypto_core/hsalsa20/core_hsalsa20_api.c \
249
248
  crypto_core/salsa20/ref/core_salsa20.c \
@@ -269,7 +268,6 @@ am__libsodium_la_SOURCES_DIST = \
269
268
  crypto_onetimeauth/poly1305/donna/poly1305_donna32.h \
270
269
  crypto_onetimeauth/poly1305/donna/poly1305_donna64.h \
271
270
  crypto_onetimeauth/poly1305/donna/poly1305_donna.c \
272
- crypto_pwhash/crypto_pwhash.c \
273
271
  crypto_pwhash/argon2/argon2-core.c \
274
272
  crypto_pwhash/argon2/argon2-core.h \
275
273
  crypto_pwhash/argon2/argon2-encoding.c \
@@ -281,6 +279,7 @@ am__libsodium_la_SOURCES_DIST = \
281
279
  crypto_pwhash/argon2/blake2b-long.h \
282
280
  crypto_pwhash/argon2/blamka-round-ref.h \
283
281
  crypto_pwhash/argon2/pwhash_argon2i.c \
282
+ crypto_pwhash/crypto_pwhash.c \
284
283
  crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c \
285
284
  crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h \
286
285
  crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c \
@@ -302,11 +301,12 @@ am__libsodium_la_SOURCES_DIST = \
302
301
  crypto_sign/ed25519/sign_ed25519_api.c \
303
302
  crypto_sign/ed25519/ref10/keypair.c \
304
303
  crypto_sign/ed25519/ref10/open.c \
305
- crypto_sign/ed25519/ref10/sign.c crypto_stream/crypto_stream.c \
304
+ crypto_sign/ed25519/ref10/sign.c \
306
305
  crypto_stream/chacha20/stream_chacha20.c \
307
306
  crypto_stream/chacha20/stream_chacha20.h \
308
307
  crypto_stream/chacha20/ref/stream_chacha20_ref.h \
309
308
  crypto_stream/chacha20/ref/stream_chacha20_ref.c \
309
+ crypto_stream/crypto_stream.c \
310
310
  crypto_stream/salsa20/stream_salsa20_api.c \
311
311
  crypto_stream/xsalsa20/stream_xsalsa20_api.c \
312
312
  crypto_stream/xsalsa20/ref/stream_xsalsa20.c \
@@ -316,9 +316,11 @@ am__libsodium_la_SOURCES_DIST = \
316
316
  crypto_verify/32/verify_32_api.c \
317
317
  crypto_verify/32/ref/verify_32.c \
318
318
  crypto_verify/64/verify_64_api.c \
319
- crypto_verify/64/ref/verify_64.c randombytes/randombytes.c \
320
- sodium/common.h sodium/core.c sodium/runtime.c sodium/utils.c \
321
- sodium/version.c \
319
+ crypto_verify/64/ref/verify_64.c \
320
+ include/sodium/private/common.h \
321
+ include/sodium/private/curve25519_ref10.h \
322
+ randombytes/randombytes.c sodium/core.c sodium/runtime.c \
323
+ sodium/utils.c sodium/version.c \
322
324
  randombytes/salsa20/randombytes_salsa20_random.c \
323
325
  randombytes/nativeclient/randombytes_nativeclient.c \
324
326
  randombytes/sysrandom/randombytes_sysrandom.c \
@@ -434,13 +436,13 @@ am_libsodium_la_OBJECTS = crypto_aead/chacha20poly1305/sodium/libsodium_la-aead_
434
436
  crypto_onetimeauth/libsodium_la-crypto_onetimeauth.lo \
435
437
  crypto_onetimeauth/poly1305/libsodium_la-onetimeauth_poly1305.lo \
436
438
  crypto_onetimeauth/poly1305/donna/libsodium_la-poly1305_donna.lo \
437
- crypto_pwhash/libsodium_la-crypto_pwhash.lo \
438
439
  crypto_pwhash/argon2/libsodium_la-argon2-core.lo \
439
440
  crypto_pwhash/argon2/libsodium_la-argon2-encoding.lo \
440
441
  crypto_pwhash/argon2/libsodium_la-argon2-fill-block-ref.lo \
441
442
  crypto_pwhash/argon2/libsodium_la-argon2.lo \
442
443
  crypto_pwhash/argon2/libsodium_la-blake2b-long.lo \
443
444
  crypto_pwhash/argon2/libsodium_la-pwhash_argon2i.lo \
445
+ crypto_pwhash/libsodium_la-crypto_pwhash.lo \
444
446
  crypto_pwhash/scryptsalsa208sha256/libsodium_la-crypto_scrypt-common.lo \
445
447
  crypto_pwhash/scryptsalsa208sha256/libsodium_la-scrypt_platform.lo \
446
448
  crypto_pwhash/scryptsalsa208sha256/libsodium_la-pbkdf2-sha256.lo \
@@ -460,9 +462,9 @@ am_libsodium_la_OBJECTS = crypto_aead/chacha20poly1305/sodium/libsodium_la-aead_
460
462
  crypto_sign/ed25519/ref10/libsodium_la-keypair.lo \
461
463
  crypto_sign/ed25519/ref10/libsodium_la-open.lo \
462
464
  crypto_sign/ed25519/ref10/libsodium_la-sign.lo \
463
- crypto_stream/libsodium_la-crypto_stream.lo \
464
465
  crypto_stream/chacha20/libsodium_la-stream_chacha20.lo \
465
466
  crypto_stream/chacha20/ref/libsodium_la-stream_chacha20_ref.lo \
467
+ crypto_stream/libsodium_la-crypto_stream.lo \
466
468
  crypto_stream/salsa20/libsodium_la-stream_salsa20_api.lo \
467
469
  crypto_stream/xsalsa20/libsodium_la-stream_xsalsa20_api.lo \
468
470
  crypto_stream/xsalsa20/ref/libsodium_la-stream_xsalsa20.lo \
@@ -799,7 +801,6 @@ libsodium_la_SOURCES = \
799
801
  crypto_core/curve25519/ref10/base.h \
800
802
  crypto_core/curve25519/ref10/base2.h \
801
803
  crypto_core/curve25519/ref10/curve25519_ref10.c \
802
- crypto_core/curve25519/ref10/curve25519_ref10.h \
803
804
  crypto_core/hsalsa20/ref2/core_hsalsa20.c \
804
805
  crypto_core/hsalsa20/core_hsalsa20_api.c \
805
806
  crypto_core/salsa20/ref/core_salsa20.c \
@@ -825,7 +826,6 @@ libsodium_la_SOURCES = \
825
826
  crypto_onetimeauth/poly1305/donna/poly1305_donna32.h \
826
827
  crypto_onetimeauth/poly1305/donna/poly1305_donna64.h \
827
828
  crypto_onetimeauth/poly1305/donna/poly1305_donna.c \
828
- crypto_pwhash/crypto_pwhash.c \
829
829
  crypto_pwhash/argon2/argon2-core.c \
830
830
  crypto_pwhash/argon2/argon2-core.h \
831
831
  crypto_pwhash/argon2/argon2-encoding.c \
@@ -837,6 +837,7 @@ libsodium_la_SOURCES = \
837
837
  crypto_pwhash/argon2/blake2b-long.h \
838
838
  crypto_pwhash/argon2/blamka-round-ref.h \
839
839
  crypto_pwhash/argon2/pwhash_argon2i.c \
840
+ crypto_pwhash/crypto_pwhash.c \
840
841
  crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c \
841
842
  crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h \
842
843
  crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c \
@@ -858,11 +859,12 @@ libsodium_la_SOURCES = \
858
859
  crypto_sign/ed25519/sign_ed25519_api.c \
859
860
  crypto_sign/ed25519/ref10/keypair.c \
860
861
  crypto_sign/ed25519/ref10/open.c \
861
- crypto_sign/ed25519/ref10/sign.c crypto_stream/crypto_stream.c \
862
+ crypto_sign/ed25519/ref10/sign.c \
862
863
  crypto_stream/chacha20/stream_chacha20.c \
863
864
  crypto_stream/chacha20/stream_chacha20.h \
864
865
  crypto_stream/chacha20/ref/stream_chacha20_ref.h \
865
866
  crypto_stream/chacha20/ref/stream_chacha20_ref.c \
867
+ crypto_stream/crypto_stream.c \
866
868
  crypto_stream/salsa20/stream_salsa20_api.c \
867
869
  crypto_stream/xsalsa20/stream_xsalsa20_api.c \
868
870
  crypto_stream/xsalsa20/ref/stream_xsalsa20.c \
@@ -872,12 +874,14 @@ libsodium_la_SOURCES = \
872
874
  crypto_verify/32/verify_32_api.c \
873
875
  crypto_verify/32/ref/verify_32.c \
874
876
  crypto_verify/64/verify_64_api.c \
875
- crypto_verify/64/ref/verify_64.c randombytes/randombytes.c \
876
- sodium/common.h sodium/core.c sodium/runtime.c sodium/utils.c \
877
- sodium/version.c $(am__append_1) $(am__append_2) \
878
- $(am__append_3) $(am__append_4) $(am__append_5) \
879
- $(am__append_6) $(am__append_7) $(am__append_8) \
880
- $(am__append_9)
877
+ crypto_verify/64/ref/verify_64.c \
878
+ include/sodium/private/common.h \
879
+ include/sodium/private/curve25519_ref10.h \
880
+ randombytes/randombytes.c sodium/core.c sodium/runtime.c \
881
+ sodium/utils.c sodium/version.c $(am__append_1) \
882
+ $(am__append_2) $(am__append_3) $(am__append_4) \
883
+ $(am__append_5) $(am__append_6) $(am__append_7) \
884
+ $(am__append_8) $(am__append_9)
881
885
  noinst_HEADERS = \
882
886
  crypto_scalarmult/curve25519/sandy2x/consts.S \
883
887
  crypto_scalarmult/curve25519/sandy2x/fe51_mul.S \
@@ -1312,15 +1316,6 @@ crypto_onetimeauth/poly1305/donna/$(DEPDIR)/$(am__dirstamp):
1312
1316
  crypto_onetimeauth/poly1305/donna/libsodium_la-poly1305_donna.lo: \
1313
1317
  crypto_onetimeauth/poly1305/donna/$(am__dirstamp) \
1314
1318
  crypto_onetimeauth/poly1305/donna/$(DEPDIR)/$(am__dirstamp)
1315
- crypto_pwhash/$(am__dirstamp):
1316
- @$(MKDIR_P) crypto_pwhash
1317
- @: > crypto_pwhash/$(am__dirstamp)
1318
- crypto_pwhash/$(DEPDIR)/$(am__dirstamp):
1319
- @$(MKDIR_P) crypto_pwhash/$(DEPDIR)
1320
- @: > crypto_pwhash/$(DEPDIR)/$(am__dirstamp)
1321
- crypto_pwhash/libsodium_la-crypto_pwhash.lo: \
1322
- crypto_pwhash/$(am__dirstamp) \
1323
- crypto_pwhash/$(DEPDIR)/$(am__dirstamp)
1324
1319
  crypto_pwhash/argon2/$(am__dirstamp):
1325
1320
  @$(MKDIR_P) crypto_pwhash/argon2
1326
1321
  @: > crypto_pwhash/argon2/$(am__dirstamp)
@@ -1345,6 +1340,15 @@ crypto_pwhash/argon2/libsodium_la-blake2b-long.lo: \
1345
1340
  crypto_pwhash/argon2/libsodium_la-pwhash_argon2i.lo: \
1346
1341
  crypto_pwhash/argon2/$(am__dirstamp) \
1347
1342
  crypto_pwhash/argon2/$(DEPDIR)/$(am__dirstamp)
1343
+ crypto_pwhash/$(am__dirstamp):
1344
+ @$(MKDIR_P) crypto_pwhash
1345
+ @: > crypto_pwhash/$(am__dirstamp)
1346
+ crypto_pwhash/$(DEPDIR)/$(am__dirstamp):
1347
+ @$(MKDIR_P) crypto_pwhash/$(DEPDIR)
1348
+ @: > crypto_pwhash/$(DEPDIR)/$(am__dirstamp)
1349
+ crypto_pwhash/libsodium_la-crypto_pwhash.lo: \
1350
+ crypto_pwhash/$(am__dirstamp) \
1351
+ crypto_pwhash/$(DEPDIR)/$(am__dirstamp)
1348
1352
  crypto_pwhash/scryptsalsa208sha256/$(am__dirstamp):
1349
1353
  @$(MKDIR_P) crypto_pwhash/scryptsalsa208sha256
1350
1354
  @: > crypto_pwhash/scryptsalsa208sha256/$(am__dirstamp)
@@ -1479,15 +1483,6 @@ crypto_sign/ed25519/ref10/libsodium_la-open.lo: \
1479
1483
  crypto_sign/ed25519/ref10/libsodium_la-sign.lo: \
1480
1484
  crypto_sign/ed25519/ref10/$(am__dirstamp) \
1481
1485
  crypto_sign/ed25519/ref10/$(DEPDIR)/$(am__dirstamp)
1482
- crypto_stream/$(am__dirstamp):
1483
- @$(MKDIR_P) crypto_stream
1484
- @: > crypto_stream/$(am__dirstamp)
1485
- crypto_stream/$(DEPDIR)/$(am__dirstamp):
1486
- @$(MKDIR_P) crypto_stream/$(DEPDIR)
1487
- @: > crypto_stream/$(DEPDIR)/$(am__dirstamp)
1488
- crypto_stream/libsodium_la-crypto_stream.lo: \
1489
- crypto_stream/$(am__dirstamp) \
1490
- crypto_stream/$(DEPDIR)/$(am__dirstamp)
1491
1486
  crypto_stream/chacha20/$(am__dirstamp):
1492
1487
  @$(MKDIR_P) crypto_stream/chacha20
1493
1488
  @: > crypto_stream/chacha20/$(am__dirstamp)
@@ -1506,6 +1501,15 @@ crypto_stream/chacha20/ref/$(DEPDIR)/$(am__dirstamp):
1506
1501
  crypto_stream/chacha20/ref/libsodium_la-stream_chacha20_ref.lo: \
1507
1502
  crypto_stream/chacha20/ref/$(am__dirstamp) \
1508
1503
  crypto_stream/chacha20/ref/$(DEPDIR)/$(am__dirstamp)
1504
+ crypto_stream/$(am__dirstamp):
1505
+ @$(MKDIR_P) crypto_stream
1506
+ @: > crypto_stream/$(am__dirstamp)
1507
+ crypto_stream/$(DEPDIR)/$(am__dirstamp):
1508
+ @$(MKDIR_P) crypto_stream/$(DEPDIR)
1509
+ @: > crypto_stream/$(DEPDIR)/$(am__dirstamp)
1510
+ crypto_stream/libsodium_la-crypto_stream.lo: \
1511
+ crypto_stream/$(am__dirstamp) \
1512
+ crypto_stream/$(DEPDIR)/$(am__dirstamp)
1509
1513
  crypto_stream/salsa20/$(am__dirstamp):
1510
1514
  @$(MKDIR_P) crypto_stream/salsa20
1511
1515
  @: > crypto_stream/salsa20/$(am__dirstamp)
@@ -2488,13 +2492,6 @@ crypto_onetimeauth/poly1305/donna/libsodium_la-poly1305_donna.lo: crypto_onetime
2488
2492
  @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2489
2493
  @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_onetimeauth/poly1305/donna/libsodium_la-poly1305_donna.lo `test -f 'crypto_onetimeauth/poly1305/donna/poly1305_donna.c' || echo '$(srcdir)/'`crypto_onetimeauth/poly1305/donna/poly1305_donna.c
2490
2494
 
2491
- crypto_pwhash/libsodium_la-crypto_pwhash.lo: crypto_pwhash/crypto_pwhash.c
2492
- @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_pwhash/libsodium_la-crypto_pwhash.lo -MD -MP -MF crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Tpo -c -o crypto_pwhash/libsodium_la-crypto_pwhash.lo `test -f 'crypto_pwhash/crypto_pwhash.c' || echo '$(srcdir)/'`crypto_pwhash/crypto_pwhash.c
2493
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Tpo crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Plo
2494
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_pwhash/crypto_pwhash.c' object='crypto_pwhash/libsodium_la-crypto_pwhash.lo' libtool=yes @AMDEPBACKSLASH@
2495
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2496
- @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_pwhash/libsodium_la-crypto_pwhash.lo `test -f 'crypto_pwhash/crypto_pwhash.c' || echo '$(srcdir)/'`crypto_pwhash/crypto_pwhash.c
2497
-
2498
2495
  crypto_pwhash/argon2/libsodium_la-argon2-core.lo: crypto_pwhash/argon2/argon2-core.c
2499
2496
  @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_pwhash/argon2/libsodium_la-argon2-core.lo -MD -MP -MF crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-core.Tpo -c -o crypto_pwhash/argon2/libsodium_la-argon2-core.lo `test -f 'crypto_pwhash/argon2/argon2-core.c' || echo '$(srcdir)/'`crypto_pwhash/argon2/argon2-core.c
2500
2497
  @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-core.Tpo crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-core.Plo
@@ -2537,6 +2534,13 @@ crypto_pwhash/argon2/libsodium_la-pwhash_argon2i.lo: crypto_pwhash/argon2/pwhash
2537
2534
  @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2538
2535
  @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_pwhash/argon2/libsodium_la-pwhash_argon2i.lo `test -f 'crypto_pwhash/argon2/pwhash_argon2i.c' || echo '$(srcdir)/'`crypto_pwhash/argon2/pwhash_argon2i.c
2539
2536
 
2537
+ crypto_pwhash/libsodium_la-crypto_pwhash.lo: crypto_pwhash/crypto_pwhash.c
2538
+ @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_pwhash/libsodium_la-crypto_pwhash.lo -MD -MP -MF crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Tpo -c -o crypto_pwhash/libsodium_la-crypto_pwhash.lo `test -f 'crypto_pwhash/crypto_pwhash.c' || echo '$(srcdir)/'`crypto_pwhash/crypto_pwhash.c
2539
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Tpo crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Plo
2540
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_pwhash/crypto_pwhash.c' object='crypto_pwhash/libsodium_la-crypto_pwhash.lo' libtool=yes @AMDEPBACKSLASH@
2541
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2542
+ @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_pwhash/libsodium_la-crypto_pwhash.lo `test -f 'crypto_pwhash/crypto_pwhash.c' || echo '$(srcdir)/'`crypto_pwhash/crypto_pwhash.c
2543
+
2540
2544
  crypto_pwhash/scryptsalsa208sha256/libsodium_la-crypto_scrypt-common.lo: crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
2541
2545
  @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_pwhash/scryptsalsa208sha256/libsodium_la-crypto_scrypt-common.lo -MD -MP -MF crypto_pwhash/scryptsalsa208sha256/$(DEPDIR)/libsodium_la-crypto_scrypt-common.Tpo -c -o crypto_pwhash/scryptsalsa208sha256/libsodium_la-crypto_scrypt-common.lo `test -f 'crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c' || echo '$(srcdir)/'`crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
2542
2546
  @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_pwhash/scryptsalsa208sha256/$(DEPDIR)/libsodium_la-crypto_scrypt-common.Tpo crypto_pwhash/scryptsalsa208sha256/$(DEPDIR)/libsodium_la-crypto_scrypt-common.Plo
@@ -2670,13 +2674,6 @@ crypto_sign/ed25519/ref10/libsodium_la-sign.lo: crypto_sign/ed25519/ref10/sign.c
2670
2674
  @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2671
2675
  @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_sign/ed25519/ref10/libsodium_la-sign.lo `test -f 'crypto_sign/ed25519/ref10/sign.c' || echo '$(srcdir)/'`crypto_sign/ed25519/ref10/sign.c
2672
2676
 
2673
- crypto_stream/libsodium_la-crypto_stream.lo: crypto_stream/crypto_stream.c
2674
- @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/libsodium_la-crypto_stream.lo -MD -MP -MF crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Tpo -c -o crypto_stream/libsodium_la-crypto_stream.lo `test -f 'crypto_stream/crypto_stream.c' || echo '$(srcdir)/'`crypto_stream/crypto_stream.c
2675
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Tpo crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Plo
2676
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_stream/crypto_stream.c' object='crypto_stream/libsodium_la-crypto_stream.lo' libtool=yes @AMDEPBACKSLASH@
2677
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2678
- @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/libsodium_la-crypto_stream.lo `test -f 'crypto_stream/crypto_stream.c' || echo '$(srcdir)/'`crypto_stream/crypto_stream.c
2679
-
2680
2677
  crypto_stream/chacha20/libsodium_la-stream_chacha20.lo: crypto_stream/chacha20/stream_chacha20.c
2681
2678
  @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/chacha20/libsodium_la-stream_chacha20.lo -MD -MP -MF crypto_stream/chacha20/$(DEPDIR)/libsodium_la-stream_chacha20.Tpo -c -o crypto_stream/chacha20/libsodium_la-stream_chacha20.lo `test -f 'crypto_stream/chacha20/stream_chacha20.c' || echo '$(srcdir)/'`crypto_stream/chacha20/stream_chacha20.c
2682
2679
  @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_stream/chacha20/$(DEPDIR)/libsodium_la-stream_chacha20.Tpo crypto_stream/chacha20/$(DEPDIR)/libsodium_la-stream_chacha20.Plo
@@ -2691,6 +2688,13 @@ crypto_stream/chacha20/ref/libsodium_la-stream_chacha20_ref.lo: crypto_stream/ch
2691
2688
  @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2692
2689
  @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/chacha20/ref/libsodium_la-stream_chacha20_ref.lo `test -f 'crypto_stream/chacha20/ref/stream_chacha20_ref.c' || echo '$(srcdir)/'`crypto_stream/chacha20/ref/stream_chacha20_ref.c
2693
2690
 
2691
+ crypto_stream/libsodium_la-crypto_stream.lo: crypto_stream/crypto_stream.c
2692
+ @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/libsodium_la-crypto_stream.lo -MD -MP -MF crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Tpo -c -o crypto_stream/libsodium_la-crypto_stream.lo `test -f 'crypto_stream/crypto_stream.c' || echo '$(srcdir)/'`crypto_stream/crypto_stream.c
2693
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Tpo crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Plo
2694
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_stream/crypto_stream.c' object='crypto_stream/libsodium_la-crypto_stream.lo' libtool=yes @AMDEPBACKSLASH@
2695
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2696
+ @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/libsodium_la-crypto_stream.lo `test -f 'crypto_stream/crypto_stream.c' || echo '$(srcdir)/'`crypto_stream/crypto_stream.c
2697
+
2694
2698
  crypto_stream/salsa20/libsodium_la-stream_salsa20_api.lo: crypto_stream/salsa20/stream_salsa20_api.c
2695
2699
  @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/salsa20/libsodium_la-stream_salsa20_api.lo -MD -MP -MF crypto_stream/salsa20/$(DEPDIR)/libsodium_la-stream_salsa20_api.Tpo -c -o crypto_stream/salsa20/libsodium_la-stream_salsa20_api.lo `test -f 'crypto_stream/salsa20/stream_salsa20_api.c' || echo '$(srcdir)/'`crypto_stream/salsa20/stream_salsa20_api.c
2696
2700
  @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_stream/salsa20/$(DEPDIR)/libsodium_la-stream_salsa20_api.Tpo crypto_stream/salsa20/$(DEPDIR)/libsodium_la-stream_salsa20_api.Plo
data/vendor/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c CHANGED
@@ -10,7 +10,7 @@
10
10
  #include "crypto_verify_16.h"
11
11
  #include "utils.h"
12
12
 
13
- #include "../../sodium/common.h"
13
+ #include "private/common.h"
14
14
 
15
15
  static const unsigned char _pad0[16] = { 0 };
16
16
 
data/vendor/libsodium/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c CHANGED
@@ -1,8 +1,8 @@
1
1
  #include <stddef.h>
2
2
  #include <stdint.h>
3
3
  #include <string.h>
4
- #include "curve25519_ref10.h"
5
4
  #include "crypto_verify_32.h"
5
+ #include "private/curve25519_ref10.h"
6
6
 
7
7
  static uint64_t load_3(const unsigned char *in)
8
8
  {
data/vendor/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c CHANGED
@@ -4,7 +4,7 @@
4
4
 
5
5
  #include "core_hchacha20.h"
6
6
  #include "crypto_core_hchacha20.h"
7
- #include "../../sodium/common.h"
7
+ #include "private/common.h"
8
8
 
9
9
  int
10
10
  crypto_core_hchacha20(unsigned char *out, const unsigned char *in,
data/vendor/libsodium/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c CHANGED
@@ -8,7 +8,7 @@ Public domain.
8
8
  #include <stdlib.h>
9
9
 
10
10
  #include "crypto_core_hsalsa20.h"
11
- #include "../../sodium/common.h"
11
+ #include "private/common.h"
12
12
 
13
13
  #define ROUNDS 20
14
14
  #define U32C(v) (v##U)
data/vendor/libsodium/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c CHANGED
@@ -8,7 +8,7 @@ Public domain.
8
8
  #include <stdlib.h>
9
9
 
10
10
  #include "crypto_core_salsa20.h"
11
- #include "../../sodium/common.h"
11
+ #include "private/common.h"
12
12
 
13
13
  #define ROUNDS 20
14
14
  #define U32C(v) (v##U)
data/vendor/libsodium/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c CHANGED
@@ -8,7 +8,7 @@ Public domain.
8
8
  #include <stdlib.h>
9
9
 
10
10
  #include "crypto_core_salsa2012.h"
11
- #include "../../sodium/common.h"
11
+ #include "private/common.h"
12
12
 
13
13
  #define ROUNDS 12
14
14
  #define U32C(v) (v##U)
data/vendor/libsodium/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c CHANGED
@@ -8,7 +8,7 @@ Public domain.
8
8
  #include <stdlib.h>
9
9
 
10
10
  #include "crypto_core_salsa208.h"
11
- #include "../../sodium/common.h"
11
+ #include "private/common.h"
12
12
 
13
13
  #define ROUNDS 8
14
14
  #define U32C(v) (v##U)
data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c CHANGED
@@ -4,7 +4,7 @@
4
4
 
5
5
  #include "blake2.h"
6
6
  #include "blake2-impl.h"
7
- #include "../../sodium/common.h"
7
+ #include "private/common.h"
8
8
 
9
9
  CRYPTO_ALIGN(64) static const uint64_t blake2b_IV[8] =
10
10
  {
data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c CHANGED
@@ -19,7 +19,7 @@
19
19
  #include "blake2.h"
20
20
  #include "blake2-impl.h"
21
21
  #include "runtime.h"
22
- #include "../../sodium/common.h"
22
+ #include "private/common.h"
23
23
 
24
24
  #ifdef HAVE_TI_MODE
25
25
  # if defined(__SIZEOF_INT128__)
@@ -86,6 +86,8 @@ static inline int blake2b_increment_counter( blake2b_state *S, const uint64_t in
86
86
 
87
87
  /* Parameter-related functions */
88
88
  #if 0
89
+ /* Redundant: digest length is directly set in blake2b_init(), blake2b_init_salt_personal(),
90
+ * blake2b_init_key() and blake2b_init_key_salt_personal() */
89
91
  static inline int blake2b_param_set_digest_length( blake2b_param *P, const uint8_t digest_length )
90
92
  {
91
93
  P->digest_length = digest_length;
data/vendor/libsodium/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c CHANGED
@@ -28,7 +28,7 @@
28
28
 
29
29
  #include "crypto_hash_sha256.h"
30
30
  #include "utils.h"
31
- #include "../../../sodium/common.h"
31
+ #include "private/common.h"
32
32
 
33
33
  #include <sys/types.h>
34
34
 
data/vendor/libsodium/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c CHANGED
@@ -28,7 +28,7 @@
28
28
 
29
29
  #include "crypto_hash_sha512.h"
30
30
  #include "utils.h"
31
- #include "../../../sodium/common.h"
31
+ #include "private/common.h"
32
32
 
33
33
  #include <sys/types.h>
34
34
 
data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h CHANGED
@@ -10,7 +10,7 @@
10
10
  # define POLY1305_NOINLINE
11
11
  #endif
12
12
 
13
- #include "../../../sodium/common.h"
13
+ #include "private/common.h"
14
14
 
15
15
  #define poly1305_block_size 16
16
16
 
data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h CHANGED
@@ -22,7 +22,7 @@ typedef unsigned uint128_t __attribute__ ((mode(TI)));
22
22
  # define POLY1305_NOINLINE
23
23
  #endif
24
24
 
25
- #include "../../../sodium/common.h"
25
+ #include "private/common.h"
26
26
 
27
27
  #define poly1305_block_size 16
28
28
 
data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-core.c CHANGED
@@ -23,7 +23,7 @@
23
23
  #include "crypto_generichash_blake2b.h"
24
24
  #include "runtime.h"
25
25
  #include "utils.h"
26
- #include "../../sodium/common.h"
26
+ #include "private/common.h"
27
27
 
28
28
  #include "argon2-core.h"
29
29
  #include "argon2-impl.h"
data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/blake2b-long.c CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  #include "crypto_generichash_blake2b.h"
7
7
  #include "utils.h"
8
- #include "../../sodium/common.h"
8
+ #include "private/common.h"
9
9
 
10
10
  #include "argon2-impl.h"
11
11
  #include "blake2b-long.h"
data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c CHANGED
@@ -36,7 +36,7 @@
36
36
 
37
37
  #include "../pbkdf2-sha256.h"
38
38
  #include "../crypto_scrypt.h"
39
- #include "../../../sodium/common.h"
39
+ #include "private/common.h"
40
40
 
41
41
  static inline void
42
42
  blkcpy_64(escrypt_block_t *dest, const escrypt_block_t *src)
data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c CHANGED
@@ -33,7 +33,7 @@
33
33
  #include "crypto_auth_hmacsha256.h"
34
34
  #include "pbkdf2-sha256.h"
35
35
  #include "utils.h"
36
- #include "../../sodium/common.h"
36
+ #include "private/common.h"
37
37
 
38
38
  /**
39
39
  * PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, c, buf, dkLen):
data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c CHANGED
@@ -46,7 +46,7 @@
46
46
 
47
47
  #include "../pbkdf2-sha256.h"
48
48
  #include "../crypto_scrypt.h"
49
- #include "../../../sodium/common.h"
49
+ #include "private/common.h"
50
50
 
51
51
  #if defined(__XOP__) && defined(DISABLED)
52
52
  #define ARX(out, in1, in2, s) \
data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c CHANGED
@@ -7,7 +7,7 @@
7
7
  #include "utils.h"
8
8
  #include "x25519_ref10.h"
9
9
  #include "../scalarmult_curve25519.h"
10
- #include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
10
+ #include "private/curve25519_ref10.h"
11
11
 
12
12
  /*
13
13
  Replace (f,g) with (g,f) if b == 1;
data/vendor/libsodium/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c CHANGED
@@ -1,5 +1,5 @@
1
1
  #include "crypto_shorthash_siphash24.h"
2
- #include "../../sodium/common.h"
2
+ #include "private/common.h"
3
3
 
4
4
  typedef uint64_t u64;
5
5
  typedef uint32_t u32;