rbnacl-libsodium 1.0.15.1 → 1.0.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +4 -6
- data/CHANGES.md +50 -42
- data/Gemfile +1 -1
- data/README.md +3 -1
- data/Rakefile +46 -0
- data/ext/rbnacl/extconf.rb +16 -1
- data/lib/rbnacl/libsodium.rb +16 -8
- data/lib/rbnacl/libsodium/version.rb +1 -1
- data/rbnacl-libsodium.gemspec +3 -0
- data/vendor/libsodium/AUTHORS +20 -5
- data/vendor/libsodium/ChangeLog +25 -0
- data/vendor/libsodium/Makefile.in +3 -1
- data/vendor/libsodium/README.markdown +2 -1
- data/vendor/libsodium/aclocal.m4 +1 -0
- data/vendor/libsodium/autom4te.cache/output.1 +836 -123
- data/vendor/libsodium/autom4te.cache/output.4 +21342 -0
- data/vendor/libsodium/autom4te.cache/requests +801 -554
- data/vendor/libsodium/autom4te.cache/traces.1 +717 -596
- data/vendor/libsodium/autom4te.cache/traces.4 +4355 -0
- data/vendor/libsodium/builds/Makefile.in +3 -1
- data/vendor/libsodium/builds/msvc/resource.h +1 -1
- data/vendor/libsodium/builds/msvc/resource.rc +2 -2
- data/vendor/libsodium/builds/msvc/version.h +2 -2
- data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj +17 -8
- data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +60 -24
- data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj +17 -8
- data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +60 -24
- data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj +17 -8
- data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +60 -24
- data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.vcxproj +17 -8
- data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters +60 -24
- data/vendor/libsodium/builds/msvc/vs2017/libsodium/libsodium.vcxproj +17 -8
- data/vendor/libsodium/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters +60 -24
- data/vendor/libsodium/configure +834 -121
- data/vendor/libsodium/configure.ac +55 -13
- data/vendor/libsodium/contrib/Findsodium.cmake +22 -3
- data/vendor/libsodium/contrib/Makefile.in +3 -1
- data/vendor/libsodium/dist-build/Makefile.in +3 -1
- data/vendor/libsodium/dist-build/android-build.sh +2 -2
- data/vendor/libsodium/dist-build/emscripten-symbols.def +38 -26
- data/vendor/libsodium/dist-build/emscripten.sh +23 -8
- data/vendor/libsodium/dist-build/msys2-win32.sh +1 -1
- data/vendor/libsodium/dist-build/msys2-win64.sh +1 -1
- data/vendor/libsodium/libsodium.vcxproj +17 -8
- data/vendor/libsodium/libsodium.vcxproj.filters +41 -14
- data/vendor/libsodium/m4/ax_tls.m4 +74 -0
- data/vendor/libsodium/msvc-scripts/Makefile.in +3 -1
- data/vendor/libsodium/msvc-scripts/process.bat +2 -2
- data/vendor/libsodium/packaging/dotnet-core/README.md +5 -5
- data/vendor/libsodium/packaging/dotnet-core/prepare.py +7 -7
- data/vendor/libsodium/packaging/nuget/package.config +1 -1
- data/vendor/libsodium/regen-msvc/libsodium.vcxproj +326 -0
- data/vendor/libsodium/regen-msvc/libsodium.vcxproj.filters +23 -0
- data/vendor/libsodium/regen-msvc/libsodium.vcxproj.filters.tpl +35 -0
- data/vendor/libsodium/regen-msvc/libsodium.vcxproj.tpl +93 -0
- data/vendor/libsodium/regen-msvc/regen-msvc.py +136 -0
- data/vendor/libsodium/regen-msvc/tl_libsodium.vcxproj.filters.tpl +23 -0
- data/vendor/libsodium/regen-msvc/tl_libsodium.vcxproj.tpl +331 -0
- data/vendor/libsodium/src/Makefile.in +3 -1
- data/vendor/libsodium/src/libsodium/Makefile.am +40 -24
- data/vendor/libsodium/src/libsodium/Makefile.in +238 -180
- data/vendor/libsodium/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c +10 -2
- data/vendor/libsodium/src/libsodium/crypto_core/ed25519/core_ed25519.c +79 -0
- data/vendor/libsodium/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c +2031 -0
- data/vendor/libsodium/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/base.h +1344 -0
- data/vendor/libsodium/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/base2.h +40 -0
- data/vendor/libsodium/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/constants.h +20 -0
- data/vendor/libsodium/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/fe.h +220 -0
- data/vendor/libsodium/src/libsodium/crypto_core/ed25519/ref10/fe_51/base.h +1344 -0
- data/vendor/libsodium/src/libsodium/crypto_core/ed25519/ref10/fe_51/base2.h +40 -0
- data/vendor/libsodium/src/libsodium/crypto_core/ed25519/ref10/fe_51/constants.h +21 -0
- data/vendor/libsodium/src/libsodium/crypto_core/ed25519/ref10/fe_51/fe.h +116 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2.h +1 -1
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ref.c +2 -1
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-ref.c +14 -82
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/generichash_blake2b.c +1 -0
- data/vendor/libsodium/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c +3 -3
- data/vendor/libsodium/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c +3 -3
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h +1 -7
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c +1 -0
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c +0 -6
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-core.c +19 -92
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-core.h +72 -4
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2.c +5 -1
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2.h +1 -1
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c +10 -7
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c +108 -231
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.h +1 -1
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c +27 -27
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_invert.c +2 -1
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe_frombytes_sandy2x.c +6 -3
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c +3 -11
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c +86 -0
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/keypair.c +28 -26
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c +32 -30
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c +14 -115
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c +56 -13
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/{ed25519_ref10.h → sign_ed25519_ref10.h} +2 -5
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/sign_ed25519.c +1 -1
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c +1 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/stream_salsa20.c +1 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/u8.h +1 -1
- data/vendor/libsodium/src/libsodium/include/Makefile.am +2 -0
- data/vendor/libsodium/src/libsodium/include/Makefile.in +13 -9
- data/vendor/libsodium/src/libsodium/include/sodium.h +2 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_core_ed25519.h +37 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_scalarmult.h +8 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h +8 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_scalarmult_ed25519.h +41 -0
- data/vendor/libsodium/src/libsodium/include/sodium/private/common.h +18 -0
- data/vendor/libsodium/src/libsodium/include/sodium/private/ed25519_ref10.h +125 -0
- data/vendor/libsodium/src/libsodium/include/sodium/private/ed25519_ref10_fe_25_5.h +1050 -0
- data/vendor/libsodium/src/libsodium/include/sodium/private/ed25519_ref10_fe_51.h +518 -0
- data/vendor/libsodium/src/libsodium/include/sodium/runtime.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/utils.h +3 -0
- data/vendor/libsodium/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c +182 -102
- data/vendor/libsodium/src/libsodium/sodium/core.c +30 -2
- data/vendor/libsodium/src/libsodium/sodium/runtime.c +14 -0
- data/vendor/libsodium/src/libsodium/sodium/utils.c +46 -0
- data/vendor/libsodium/test/Makefile.in +3 -1
- data/vendor/libsodium/test/default/Makefile.am +16 -0
- data/vendor/libsodium/test/default/Makefile.in +71 -23
- data/vendor/libsodium/test/default/aead_aes256gcm.c +1 -1
- data/vendor/libsodium/test/default/cmptest.h +4 -0
- data/vendor/libsodium/test/default/core3.c +44 -4
- data/vendor/libsodium/test/default/core3.exp +2 -0
- data/vendor/libsodium/test/default/core4.c +1 -1
- data/vendor/libsodium/test/default/core_ed25519.c +151 -0
- data/vendor/libsodium/test/default/core_ed25519.exp +1 -0
- data/vendor/libsodium/test/default/ed25519_convert.c +9 -1
- data/vendor/libsodium/test/default/index.html.tpl +17 -3
- data/vendor/libsodium/test/default/kdf.c +4 -2
- data/vendor/libsodium/test/default/metamorphic.c +8 -8
- data/vendor/libsodium/test/default/misuse.c +29 -1
- data/vendor/libsodium/test/default/pwhash_argon2i.c +9 -3
- data/vendor/libsodium/test/default/pwhash_argon2i.exp +2 -2
- data/vendor/libsodium/test/default/pwhash_argon2id.c +7 -2
- data/vendor/libsodium/test/default/pwhash_argon2id.exp +2 -2
- data/vendor/libsodium/test/default/scalarmult.c +0 -2
- data/vendor/libsodium/test/default/scalarmult.exp +0 -1
- data/vendor/libsodium/test/default/scalarmult_ed25519.c +90 -0
- data/vendor/libsodium/test/default/scalarmult_ed25519.exp +1 -0
- data/vendor/libsodium/test/default/secretbox_easy2.c +1 -1
- data/vendor/libsodium/test/default/secretstream.c +52 -3
- data/vendor/libsodium/test/default/sign.c +16 -0
- data/vendor/libsodium/test/default/sodium_core.c +1 -0
- data/vendor/libsodium/test/default/sodium_utils.c +2 -1
- data/vendor/libsodium/test/default/xchacha20.c +2 -1
- metadata +63 -12
- data/vendor/libsodium/src/libsodium/crypto_core/curve25519/ref10/base.h +0 -1344
- data/vendor/libsodium/src/libsodium/crypto_core/curve25519/ref10/base2.h +0 -40
- data/vendor/libsodium/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c +0 -2797
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.c +0 -545
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.h +0 -10
- data/vendor/libsodium/src/libsodium/include/sodium/private/curve25519_ref10.h +0 -132
- data/vendor/libsodium/test/default/index-wasm.html.tpl +0 -118
@@ -1,6 +1,6 @@
|
|
1
1
|
#! /bin/sh
|
2
2
|
|
3
|
-
export CFLAGS="-
|
3
|
+
export CFLAGS="-Ofast -fomit-frame-pointer -m32 -march=pentium3 -mtune=westmere"
|
4
4
|
export PREFIX="$(pwd)/libsodium-win32"
|
5
5
|
|
6
6
|
if (i686-w64-mingw32-gcc --version > /dev/null 2>&1) then
|
@@ -364,11 +364,11 @@
|
|
364
364
|
<ClCompile Include="src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphashx24_ref.c" />
|
365
365
|
<ClCompile Include="src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24_ref.c" />
|
366
366
|
<ClCompile Include="src\libsodium\crypto_scalarmult\crypto_scalarmult.c" />
|
367
|
+
<ClCompile Include="src\libsodium\crypto_scalarmult\ed25519\ref10\scalarmult_ed25519_ref10.c" />
|
367
368
|
<ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519.c" />
|
368
369
|
<ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\curve25519_sandy2x.c" />
|
369
370
|
<ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\fe_frombytes_sandy2x.c" />
|
370
371
|
<ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\fe51_invert.c" />
|
371
|
-
<ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\donna_c64\curve25519_donna_c64.c" />
|
372
372
|
<ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\x25519_ref10.c" />
|
373
373
|
<ClCompile Include="src\libsodium\crypto_onetimeauth\crypto_onetimeauth.c" />
|
374
374
|
<ClCompile Include="src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.c" />
|
@@ -418,7 +418,8 @@
|
|
418
418
|
<ClCompile Include="src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
|
419
419
|
<ClCompile Include="src\libsodium\crypto_core\hsalsa20\core_hsalsa20.c" />
|
420
420
|
<ClCompile Include="src\libsodium\crypto_core\hsalsa20\ref2\core_hsalsa20_ref2.c" />
|
421
|
-
<ClCompile Include="src\libsodium\crypto_core\
|
421
|
+
<ClCompile Include="src\libsodium\crypto_core\ed25519\core_ed25519.c" />
|
422
|
+
<ClCompile Include="src\libsodium\crypto_core\ed25519\ref10\ed25519_ref10.c" />
|
422
423
|
</ItemGroup>
|
423
424
|
<ItemGroup>
|
424
425
|
<ClInclude Include="src\libsodium\crypto_generichash\blake2b\ref\blake2b-load-sse2.h" />
|
@@ -428,7 +429,7 @@
|
|
428
429
|
<ClInclude Include="src\libsodium\crypto_generichash\blake2b\ref\blake2b-load-sse41.h" />
|
429
430
|
<ClInclude Include="src\libsodium\crypto_generichash\blake2b\ref\blake2b-compress-avx2.h" />
|
430
431
|
<ClInclude Include="src\libsodium\crypto_generichash\blake2b\ref\blake2b-compress-sse41.h" />
|
431
|
-
<ClInclude Include="src\libsodium\crypto_sign\ed25519\ref10\
|
432
|
+
<ClInclude Include="src\libsodium\crypto_sign\ed25519\ref10\sign_ed25519_ref10.h" />
|
432
433
|
<ClInclude Include="src\libsodium\include\sodium.h" />
|
433
434
|
<ClInclude Include="src\libsodium\include\sodium\crypto_stream_salsa2012.h" />
|
434
435
|
<ClInclude Include="src\libsodium\include\sodium\crypto_auth.h" />
|
@@ -436,7 +437,6 @@
|
|
436
437
|
<ClInclude Include="src\libsodium\include\sodium\crypto_core_hchacha20.h" />
|
437
438
|
<ClInclude Include="src\libsodium\include\sodium\crypto_hash_sha512.h" />
|
438
439
|
<ClInclude Include="src\libsodium\include\sodium\core.h" />
|
439
|
-
<ClInclude Include="src\libsodium\include\sodium\version.h" />
|
440
440
|
<ClInclude Include="src\libsodium\include\sodium\export.h" />
|
441
441
|
<ClInclude Include="src\libsodium\include\sodium\randombytes_salsa20_random.h" />
|
442
442
|
<ClInclude Include="src\libsodium\include\sodium\crypto_core_salsa20.h" />
|
@@ -482,14 +482,18 @@
|
|
482
482
|
<ClInclude Include="src\libsodium\include\sodium\crypto_onetimeauth.h" />
|
483
483
|
<ClInclude Include="src\libsodium\include\sodium\crypto_verify_64.h" />
|
484
484
|
<ClInclude Include="src\libsodium\include\sodium\crypto_box_curve25519xchacha20poly1305.h" />
|
485
|
+
<ClInclude Include="src\libsodium\include\sodium\crypto_core_ed25519.h" />
|
485
486
|
<ClInclude Include="src\libsodium\include\sodium\crypto_pwhash_argon2i.h" />
|
486
487
|
<ClInclude Include="src\libsodium\include\sodium\crypto_generichash.h" />
|
487
488
|
<ClInclude Include="src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h" />
|
488
489
|
<ClInclude Include="src\libsodium\include\sodium\crypto_secretbox.h" />
|
490
|
+
<ClInclude Include="src\libsodium\include\sodium\crypto_scalarmult_ed25519.h" />
|
489
491
|
<ClInclude Include="src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
|
490
492
|
<ClInclude Include="src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
|
491
493
|
<ClInclude Include="src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" />
|
492
|
-
<ClInclude Include="src\libsodium\include\sodium\private\
|
494
|
+
<ClInclude Include="src\libsodium\include\sodium\private\ed25519_ref10.h" />
|
495
|
+
<ClInclude Include="src\libsodium\include\sodium\private\ed25519_ref10_fe_25_5.h" />
|
496
|
+
<ClInclude Include="src\libsodium\include\sodium\private\ed25519_ref10_fe_51.h" />
|
493
497
|
<ClInclude Include="src\libsodium\include\sodium\private\sse2_64_32.h" />
|
494
498
|
<ClInclude Include="src\libsodium\include\sodium\private\common.h" />
|
495
499
|
<ClInclude Include="src\libsodium\include\sodium\private\mutex.h" />
|
@@ -515,7 +519,6 @@
|
|
515
519
|
<ClInclude Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\curve25519_sandy2x.h" />
|
516
520
|
<ClInclude Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\fe51_namespace.h" />
|
517
521
|
<ClInclude Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\ladder_base.h" />
|
518
|
-
<ClInclude Include="src\libsodium\crypto_scalarmult\curve25519\donna_c64\curve25519_donna_c64.h" />
|
519
522
|
<ClInclude Include="src\libsodium\crypto_scalarmult\curve25519\ref10\x25519_ref10.h" />
|
520
523
|
<ClInclude Include="src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.h" />
|
521
524
|
<ClInclude Include="src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.h" />
|
@@ -539,8 +542,14 @@
|
|
539
542
|
<ClInclude Include="src\libsodium\crypto_stream\salsa20\xmm6int\u8.h" />
|
540
543
|
<ClInclude Include="src\libsodium\crypto_stream\salsa20\xmm6int\salsa20_xmm6int-sse2.h" />
|
541
544
|
<ClInclude Include="src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h" />
|
542
|
-
<ClInclude Include="src\libsodium\crypto_core\
|
543
|
-
<ClInclude Include="src\libsodium\crypto_core\
|
545
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h" />
|
546
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_25_5\fe.h" />
|
547
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base2.h" />
|
548
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base.h" />
|
549
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_51\constants.h" />
|
550
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_51\fe.h" />
|
551
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_51\base2.h" />
|
552
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_51\base.h" />
|
544
553
|
<ClInclude Include="builds\msvc\resource.h" />
|
545
554
|
</ItemGroup>
|
546
555
|
<ItemGroup>
|
@@ -162,6 +162,9 @@
|
|
162
162
|
<ClCompile Include="src\libsodium\crypto_scalarmult\crypto_scalarmult.c">
|
163
163
|
<Filter>Source Files</Filter>
|
164
164
|
</ClCompile>
|
165
|
+
<ClCompile Include="src\libsodium\crypto_scalarmult\ed25519\ref10\scalarmult_ed25519_ref10.c">
|
166
|
+
<Filter>Source Files</Filter>
|
167
|
+
</ClCompile>
|
165
168
|
<ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519.c">
|
166
169
|
<Filter>Source Files</Filter>
|
167
170
|
</ClCompile>
|
@@ -174,9 +177,6 @@
|
|
174
177
|
<ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\fe51_invert.c">
|
175
178
|
<Filter>Source Files</Filter>
|
176
179
|
</ClCompile>
|
177
|
-
<ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\donna_c64\curve25519_donna_c64.c">
|
178
|
-
<Filter>Source Files</Filter>
|
179
|
-
</ClCompile>
|
180
180
|
<ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\x25519_ref10.c">
|
181
181
|
<Filter>Source Files</Filter>
|
182
182
|
</ClCompile>
|
@@ -324,7 +324,10 @@
|
|
324
324
|
<ClCompile Include="src\libsodium\crypto_core\hsalsa20\ref2\core_hsalsa20_ref2.c">
|
325
325
|
<Filter>Source Files</Filter>
|
326
326
|
</ClCompile>
|
327
|
-
<ClCompile Include="src\libsodium\crypto_core\
|
327
|
+
<ClCompile Include="src\libsodium\crypto_core\ed25519\core_ed25519.c">
|
328
|
+
<Filter>Source Files</Filter>
|
329
|
+
</ClCompile>
|
330
|
+
<ClCompile Include="src\libsodium\crypto_core\ed25519\ref10\ed25519_ref10.c">
|
328
331
|
<Filter>Source Files</Filter>
|
329
332
|
</ClCompile>
|
330
333
|
</ItemGroup>
|
@@ -350,7 +353,7 @@
|
|
350
353
|
<ClInclude Include="src\libsodium\crypto_generichash\blake2b\ref\blake2b-compress-sse41.h">
|
351
354
|
<Filter>Header Files</Filter>
|
352
355
|
</ClInclude>
|
353
|
-
<ClInclude Include="src\libsodium\crypto_sign\ed25519\ref10\
|
356
|
+
<ClInclude Include="src\libsodium\crypto_sign\ed25519\ref10\sign_ed25519_ref10.h">
|
354
357
|
<Filter>Header Files</Filter>
|
355
358
|
</ClInclude>
|
356
359
|
<ClInclude Include="src\libsodium\include\sodium.h">
|
@@ -374,9 +377,6 @@
|
|
374
377
|
<ClInclude Include="src\libsodium\include\sodium\core.h">
|
375
378
|
<Filter>Header Files</Filter>
|
376
379
|
</ClInclude>
|
377
|
-
<ClInclude Include="src\libsodium\include\sodium\version.h">
|
378
|
-
<Filter>Header Files</Filter>
|
379
|
-
</ClInclude>
|
380
380
|
<ClInclude Include="src\libsodium\include\sodium\export.h">
|
381
381
|
<Filter>Header Files</Filter>
|
382
382
|
</ClInclude>
|
@@ -512,6 +512,9 @@
|
|
512
512
|
<ClInclude Include="src\libsodium\include\sodium\crypto_box_curve25519xchacha20poly1305.h">
|
513
513
|
<Filter>Header Files</Filter>
|
514
514
|
</ClInclude>
|
515
|
+
<ClInclude Include="src\libsodium\include\sodium\crypto_core_ed25519.h">
|
516
|
+
<Filter>Header Files</Filter>
|
517
|
+
</ClInclude>
|
515
518
|
<ClInclude Include="src\libsodium\include\sodium\crypto_pwhash_argon2i.h">
|
516
519
|
<Filter>Header Files</Filter>
|
517
520
|
</ClInclude>
|
@@ -524,6 +527,9 @@
|
|
524
527
|
<ClInclude Include="src\libsodium\include\sodium\crypto_secretbox.h">
|
525
528
|
<Filter>Header Files</Filter>
|
526
529
|
</ClInclude>
|
530
|
+
<ClInclude Include="src\libsodium\include\sodium\crypto_scalarmult_ed25519.h">
|
531
|
+
<Filter>Header Files</Filter>
|
532
|
+
</ClInclude>
|
527
533
|
<ClInclude Include="src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h">
|
528
534
|
<Filter>Header Files</Filter>
|
529
535
|
</ClInclude>
|
@@ -533,7 +539,13 @@
|
|
533
539
|
<ClInclude Include="src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h">
|
534
540
|
<Filter>Header Files</Filter>
|
535
541
|
</ClInclude>
|
536
|
-
<ClInclude Include="src\libsodium\include\sodium\private\
|
542
|
+
<ClInclude Include="src\libsodium\include\sodium\private\ed25519_ref10.h">
|
543
|
+
<Filter>Header Files</Filter>
|
544
|
+
</ClInclude>
|
545
|
+
<ClInclude Include="src\libsodium\include\sodium\private\ed25519_ref10_fe_25_5.h">
|
546
|
+
<Filter>Header Files</Filter>
|
547
|
+
</ClInclude>
|
548
|
+
<ClInclude Include="src\libsodium\include\sodium\private\ed25519_ref10_fe_51.h">
|
537
549
|
<Filter>Header Files</Filter>
|
538
550
|
</ClInclude>
|
539
551
|
<ClInclude Include="src\libsodium\include\sodium\private\sse2_64_32.h">
|
@@ -611,9 +623,6 @@
|
|
611
623
|
<ClInclude Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\ladder_base.h">
|
612
624
|
<Filter>Header Files</Filter>
|
613
625
|
</ClInclude>
|
614
|
-
<ClInclude Include="src\libsodium\crypto_scalarmult\curve25519\donna_c64\curve25519_donna_c64.h">
|
615
|
-
<Filter>Header Files</Filter>
|
616
|
-
</ClInclude>
|
617
626
|
<ClInclude Include="src\libsodium\crypto_scalarmult\curve25519\ref10\x25519_ref10.h">
|
618
627
|
<Filter>Header Files</Filter>
|
619
628
|
</ClInclude>
|
@@ -683,10 +692,28 @@
|
|
683
692
|
<ClInclude Include="src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h">
|
684
693
|
<Filter>Header Files</Filter>
|
685
694
|
</ClInclude>
|
686
|
-
<ClInclude Include="src\libsodium\crypto_core\
|
695
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h">
|
696
|
+
<Filter>Header Files</Filter>
|
697
|
+
</ClInclude>
|
698
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_25_5\fe.h">
|
699
|
+
<Filter>Header Files</Filter>
|
700
|
+
</ClInclude>
|
701
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base2.h">
|
702
|
+
<Filter>Header Files</Filter>
|
703
|
+
</ClInclude>
|
704
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base.h">
|
705
|
+
<Filter>Header Files</Filter>
|
706
|
+
</ClInclude>
|
707
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_51\constants.h">
|
708
|
+
<Filter>Header Files</Filter>
|
709
|
+
</ClInclude>
|
710
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_51\fe.h">
|
711
|
+
<Filter>Header Files</Filter>
|
712
|
+
</ClInclude>
|
713
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_51\base2.h">
|
687
714
|
<Filter>Header Files</Filter>
|
688
715
|
</ClInclude>
|
689
|
-
<ClInclude Include="src\libsodium\crypto_core\
|
716
|
+
<ClInclude Include="src\libsodium\crypto_core\ed25519\ref10\fe_51\base.h">
|
690
717
|
<Filter>Header Files</Filter>
|
691
718
|
</ClInclude>
|
692
719
|
</ItemGroup>
|
@@ -0,0 +1,74 @@
|
|
1
|
+
# ===========================================================================
|
2
|
+
# https://www.gnu.org/software/autoconf-archive/ax_tls.html
|
3
|
+
# ===========================================================================
|
4
|
+
#
|
5
|
+
# SYNOPSIS
|
6
|
+
#
|
7
|
+
# AX_TLS([action-if-found], [action-if-not-found])
|
8
|
+
#
|
9
|
+
# DESCRIPTION
|
10
|
+
#
|
11
|
+
# Provides a test for the compiler support of thread local storage (TLS)
|
12
|
+
# extensions. Defines TLS if it is found. Currently knows about C++11,
|
13
|
+
# GCC/ICC, and MSVC. I think SunPro uses the same as GCC, and Borland
|
14
|
+
# apparently supports either.
|
15
|
+
#
|
16
|
+
# LICENSE
|
17
|
+
#
|
18
|
+
# Copyright (c) 2008 Alan Woodland <ajw05@aber.ac.uk>
|
19
|
+
# Copyright (c) 2010 Diego Elio Petteno` <flameeyes@gmail.com>
|
20
|
+
#
|
21
|
+
# This program is free software: you can redistribute it and/or modify it
|
22
|
+
# under the terms of the GNU General Public License as published by the
|
23
|
+
# Free Software Foundation, either version 3 of the License, or (at your
|
24
|
+
# option) any later version.
|
25
|
+
#
|
26
|
+
# This program is distributed in the hope that it will be useful, but
|
27
|
+
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
28
|
+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
29
|
+
# Public License for more details.
|
30
|
+
#
|
31
|
+
# You should have received a copy of the GNU General Public License along
|
32
|
+
# with this program. If not, see <https://www.gnu.org/licenses/>.
|
33
|
+
#
|
34
|
+
# As a special exception, the respective Autoconf Macro's copyright owner
|
35
|
+
# gives unlimited permission to copy, distribute and modify the configure
|
36
|
+
# scripts that are the output of Autoconf when processing the Macro. You
|
37
|
+
# need not follow the terms of the GNU General Public License when using
|
38
|
+
# or distributing such scripts, even though portions of the text of the
|
39
|
+
# Macro appear in them. The GNU General Public License (GPL) does govern
|
40
|
+
# all other use of the material that constitutes the Autoconf Macro.
|
41
|
+
#
|
42
|
+
# This special exception to the GPL applies to versions of the Autoconf
|
43
|
+
# Macro released by the Autoconf Archive. When you make and distribute a
|
44
|
+
# modified version of the Autoconf Macro, you may extend this special
|
45
|
+
# exception to the GPL to apply to your modified version as well.
|
46
|
+
|
47
|
+
#serial 14
|
48
|
+
|
49
|
+
AC_DEFUN([AX_TLS], [
|
50
|
+
AC_MSG_CHECKING([for thread local storage (TLS) class])
|
51
|
+
AC_CACHE_VAL([ac_cv_tls],
|
52
|
+
[for ax_tls_keyword in thread_local _Thread_local __thread '__declspec(thread)' none; do
|
53
|
+
AS_CASE([$ax_tls_keyword],
|
54
|
+
[none], [ac_cv_tls=none ; break],
|
55
|
+
[AC_TRY_COMPILE(
|
56
|
+
[#include <stdlib.h>
|
57
|
+
static void
|
58
|
+
foo(void) {
|
59
|
+
static ] $ax_tls_keyword [ int bar;
|
60
|
+
exit(1);
|
61
|
+
}],
|
62
|
+
[],
|
63
|
+
[ac_cv_tls=$ax_tls_keyword ; break],
|
64
|
+
ac_cv_tls=none
|
65
|
+
)])
|
66
|
+
done
|
67
|
+
])
|
68
|
+
AC_MSG_RESULT([$ac_cv_tls])
|
69
|
+
|
70
|
+
AS_IF([test "$ac_cv_tls" != "none"],
|
71
|
+
[AC_DEFINE_UNQUOTED([TLS],[$ac_cv_tls],[If the compiler supports a TLS storage class define it to that here])
|
72
|
+
m4_ifnblank([$1],[$1])],
|
73
|
+
[m4_ifnblank([$2],[$2])])
|
74
|
+
])
|
@@ -94,7 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \
|
|
94
94
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
95
95
|
$(top_srcdir)/m4/ax_check_define.m4 \
|
96
96
|
$(top_srcdir)/m4/ax_check_link_flag.m4 \
|
97
|
-
$(top_srcdir)/m4/ax_pthread.m4 \
|
97
|
+
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_tls.m4 \
|
98
98
|
$(top_srcdir)/m4/ax_valgrind_check.m4 \
|
99
99
|
$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
|
100
100
|
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
|
@@ -129,6 +129,7 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
|
129
129
|
am__DIST_COMMON = $(srcdir)/Makefile.in
|
130
130
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
131
131
|
ACLOCAL = @ACLOCAL@
|
132
|
+
ALLOCA = @ALLOCA@
|
132
133
|
AMTAR = @AMTAR@
|
133
134
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
134
135
|
AR = @AR@
|
@@ -149,6 +150,7 @@ CFLAGS_AVX2 = @CFLAGS_AVX2@
|
|
149
150
|
CFLAGS_AVX512F = @CFLAGS_AVX512F@
|
150
151
|
CFLAGS_MMX = @CFLAGS_MMX@
|
151
152
|
CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
|
153
|
+
CFLAGS_RDRAND = @CFLAGS_RDRAND@
|
152
154
|
CFLAGS_SSE2 = @CFLAGS_SSE2@
|
153
155
|
CFLAGS_SSE3 = @CFLAGS_SSE3@
|
154
156
|
CFLAGS_SSE41 = @CFLAGS_SSE41@
|
@@ -1,5 +1,5 @@
|
|
1
|
-
cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.
|
1
|
+
cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.16/ < src\libsodium\include\sodium\version.h.in > tmp
|
2
2
|
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/10/ < tmp > tmp2
|
3
|
-
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/
|
3
|
+
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/1/ < tmp2 > tmp3
|
4
4
|
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > src\libsodium\include\sodium\version.h
|
5
5
|
del tmp tmp2 tmp3
|
@@ -31,15 +31,15 @@ Version numbers for the packages for .NET Core consist of three components:
|
|
31
31
|
It may be necessary to release more than one package for a libsodium version,
|
32
32
|
e.g., when adding support for a new platform or if a release contains a broken
|
33
33
|
binary. In this case, a package revision number is added as a fourth part to
|
34
|
-
the libsodium version, starting at `1`. For example, `1.0.
|
35
|
-
release of the package for libsodium 1.0.
|
34
|
+
the libsodium version, starting at `1`. For example, `1.0.16` is the initial
|
35
|
+
release of the package for libsodium 1.0.16 and `1.0.16.5` is the fifth
|
36
36
|
revision (sixth release) of that package.
|
37
37
|
* *pre-release label*
|
38
38
|
If a package is a pre-release, a label is appended to the version number in
|
39
39
|
`-preview-##` format where `##` is the number of the pre-release, starting at
|
40
|
-
`01`. For example, `1.0.
|
41
|
-
for libsodium 1.0.
|
42
|
-
fifth revision of the package for libsodium 1.0.
|
40
|
+
`01`. For example, `1.0.16-preview-01` is the first pre-release of the package
|
41
|
+
for libsodium 1.0.16 and `1.0.16.5-preview-02` the second pre-release of the
|
42
|
+
fifth revision of the package for libsodium 1.0.16.
|
43
43
|
|
44
44
|
|
45
45
|
**Making a release**
|
@@ -170,13 +170,13 @@ def main(args):
|
|
170
170
|
print(' python3 prepare.py <version>')
|
171
171
|
print()
|
172
172
|
print('Examples:')
|
173
|
-
print(' python3 prepare.py 1.0.
|
174
|
-
print(' python3 prepare.py 1.0.
|
175
|
-
print(' python3 prepare.py 1.0.
|
176
|
-
print(' python3 prepare.py 1.0.
|
177
|
-
print(' python3 prepare.py 1.0.
|
178
|
-
print(' python3 prepare.py 1.0.
|
179
|
-
print(' python3 prepare.py 1.0.
|
173
|
+
print(' python3 prepare.py 1.0.16-preview-01')
|
174
|
+
print(' python3 prepare.py 1.0.16-preview-02')
|
175
|
+
print(' python3 prepare.py 1.0.16-preview-03')
|
176
|
+
print(' python3 prepare.py 1.0.16')
|
177
|
+
print(' python3 prepare.py 1.0.16.1-preview-01')
|
178
|
+
print(' python3 prepare.py 1.0.16.1')
|
179
|
+
print(' python3 prepare.py 1.0.16.2')
|
180
180
|
return 1
|
181
181
|
|
182
182
|
version = Version(m.group(2), m.group(0))
|
@@ -1,4 +1,4 @@
|
|
1
1
|
<?xml version="1.0" encoding="utf-8"?>
|
2
2
|
<!-- These values are populated into the package.gsl templates by package.bat. -->
|
3
3
|
<!-- The target attribute controls path and file name only, id controls package naming. -->
|
4
|
-
<package id="libsodium_vc120" target="libsodium" version = "1.0.
|
4
|
+
<package id="libsodium_vc120" target="libsodium" version = "1.0.16.0" pathversion="1_0_16_0" platformtoolset="v120" />
|
@@ -0,0 +1,326 @@
|
|
1
|
+
<?xml version="1.0" encoding="utf-8"?>
|
2
|
+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
3
|
+
<ItemGroup Label="ProjectConfigurations">
|
4
|
+
<ProjectConfiguration Include="DebugDLL|Win32">
|
5
|
+
<Configuration>DebugDLL</Configuration>
|
6
|
+
<Platform>Win32</Platform>
|
7
|
+
</ProjectConfiguration>
|
8
|
+
<ProjectConfiguration Include="DebugDLL|x64">
|
9
|
+
<Configuration>DebugDLL</Configuration>
|
10
|
+
<Platform>x64</Platform>
|
11
|
+
</ProjectConfiguration>
|
12
|
+
<ProjectConfiguration Include="Debug|Win32">
|
13
|
+
<Configuration>Debug</Configuration>
|
14
|
+
<Platform>Win32</Platform>
|
15
|
+
</ProjectConfiguration>
|
16
|
+
<ProjectConfiguration Include="Debug|x64">
|
17
|
+
<Configuration>Debug</Configuration>
|
18
|
+
<Platform>x64</Platform>
|
19
|
+
</ProjectConfiguration>
|
20
|
+
<ProjectConfiguration Include="ReleaseDLL|Win32">
|
21
|
+
<Configuration>ReleaseDLL</Configuration>
|
22
|
+
<Platform>Win32</Platform>
|
23
|
+
</ProjectConfiguration>
|
24
|
+
<ProjectConfiguration Include="ReleaseDLL|x64">
|
25
|
+
<Configuration>ReleaseDLL</Configuration>
|
26
|
+
<Platform>x64</Platform>
|
27
|
+
</ProjectConfiguration>
|
28
|
+
<ProjectConfiguration Include="Release|Win32">
|
29
|
+
<Configuration>Release</Configuration>
|
30
|
+
<Platform>Win32</Platform>
|
31
|
+
</ProjectConfiguration>
|
32
|
+
<ProjectConfiguration Include="Release|x64">
|
33
|
+
<Configuration>Release</Configuration>
|
34
|
+
<Platform>x64</Platform>
|
35
|
+
</ProjectConfiguration>
|
36
|
+
</ItemGroup>
|
37
|
+
<PropertyGroup Label="Globals">
|
38
|
+
<ProjectGuid>{A185B162-6CB6-4502-B03F-B56F7699A8D9}</ProjectGuid>
|
39
|
+
<Keyword>Win32Proj</Keyword>
|
40
|
+
<RootNamespace>libsodium</RootNamespace>
|
41
|
+
</PropertyGroup>
|
42
|
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
43
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
44
|
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
45
|
+
<UseDebugLibraries>true</UseDebugLibraries>
|
46
|
+
<CharacterSet>MultiByte</CharacterSet>
|
47
|
+
<WholeProgramOptimization>false</WholeProgramOptimization>
|
48
|
+
<PlatformToolset>v140</PlatformToolset>
|
49
|
+
</PropertyGroup>
|
50
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration">
|
51
|
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
52
|
+
<UseDebugLibraries>true</UseDebugLibraries>
|
53
|
+
<CharacterSet>MultiByte</CharacterSet>
|
54
|
+
<WholeProgramOptimization>false</WholeProgramOptimization>
|
55
|
+
<PlatformToolset>v140</PlatformToolset>
|
56
|
+
</PropertyGroup>
|
57
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
58
|
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
59
|
+
<UseDebugLibraries>true</UseDebugLibraries>
|
60
|
+
<CharacterSet>MultiByte</CharacterSet>
|
61
|
+
<WholeProgramOptimization>false</WholeProgramOptimization>
|
62
|
+
<PlatformToolset>v140</PlatformToolset>
|
63
|
+
</PropertyGroup>
|
64
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration">
|
65
|
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
66
|
+
<UseDebugLibraries>true</UseDebugLibraries>
|
67
|
+
<CharacterSet>MultiByte</CharacterSet>
|
68
|
+
<WholeProgramOptimization>false</WholeProgramOptimization>
|
69
|
+
<PlatformToolset>v140</PlatformToolset>
|
70
|
+
</PropertyGroup>
|
71
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
72
|
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
73
|
+
<UseDebugLibraries>false</UseDebugLibraries>
|
74
|
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
75
|
+
<CharacterSet>MultiByte</CharacterSet>
|
76
|
+
<PlatformToolset>v140</PlatformToolset>
|
77
|
+
</PropertyGroup>
|
78
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="Configuration">
|
79
|
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
80
|
+
<UseDebugLibraries>false</UseDebugLibraries>
|
81
|
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
82
|
+
<CharacterSet>MultiByte</CharacterSet>
|
83
|
+
<PlatformToolset>v140</PlatformToolset>
|
84
|
+
</PropertyGroup>
|
85
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
86
|
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
87
|
+
<UseDebugLibraries>false</UseDebugLibraries>
|
88
|
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
89
|
+
<CharacterSet>MultiByte</CharacterSet>
|
90
|
+
<PlatformToolset>v140</PlatformToolset>
|
91
|
+
</PropertyGroup>
|
92
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration">
|
93
|
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
94
|
+
<UseDebugLibraries>false</UseDebugLibraries>
|
95
|
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
96
|
+
<CharacterSet>MultiByte</CharacterSet>
|
97
|
+
<PlatformToolset>v140</PlatformToolset>
|
98
|
+
</PropertyGroup>
|
99
|
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
100
|
+
<ImportGroup Label="ExtensionSettings">
|
101
|
+
</ImportGroup>
|
102
|
+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
103
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
104
|
+
<Import Project="msvc-scripts\sodium.props" />
|
105
|
+
</ImportGroup>
|
106
|
+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
|
107
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
108
|
+
<Import Project="msvc-scripts\sodium.props" />
|
109
|
+
</ImportGroup>
|
110
|
+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
111
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
112
|
+
<Import Project="msvc-scripts\sodium.props" />
|
113
|
+
</ImportGroup>
|
114
|
+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
|
115
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
116
|
+
<Import Project="msvc-scripts\sodium.props" />
|
117
|
+
</ImportGroup>
|
118
|
+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
119
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
120
|
+
<Import Project="msvc-scripts\sodium.props" />
|
121
|
+
</ImportGroup>
|
122
|
+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
|
123
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
124
|
+
<Import Project="msvc-scripts\sodium.props" />
|
125
|
+
</ImportGroup>
|
126
|
+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
127
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
128
|
+
<Import Project="msvc-scripts\sodium.props" />
|
129
|
+
</ImportGroup>
|
130
|
+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
|
131
|
+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
132
|
+
<Import Project="msvc-scripts\sodium.props" />
|
133
|
+
</ImportGroup>
|
134
|
+
<PropertyGroup Label="UserMacros" />
|
135
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
136
|
+
<LinkIncremental>true</LinkIncremental>
|
137
|
+
<OutDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\</OutDir>
|
138
|
+
<IntDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\</IntDir>
|
139
|
+
</PropertyGroup>
|
140
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
|
141
|
+
<LinkIncremental>true</LinkIncremental>
|
142
|
+
<OutDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\</OutDir>
|
143
|
+
<IntDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\</IntDir>
|
144
|
+
</PropertyGroup>
|
145
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
146
|
+
<LinkIncremental>true</LinkIncremental>
|
147
|
+
<OutDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\</OutDir>
|
148
|
+
<IntDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\</IntDir>
|
149
|
+
</PropertyGroup>
|
150
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
|
151
|
+
<LinkIncremental>true</LinkIncremental>
|
152
|
+
<OutDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\</OutDir>
|
153
|
+
<IntDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\</IntDir>
|
154
|
+
</PropertyGroup>
|
155
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
156
|
+
<LinkIncremental>false</LinkIncremental>
|
157
|
+
<OutDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\</OutDir>
|
158
|
+
<IntDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\</IntDir>
|
159
|
+
</PropertyGroup>
|
160
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
|
161
|
+
<LinkIncremental>false</LinkIncremental>
|
162
|
+
<OutDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\</OutDir>
|
163
|
+
<IntDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\</IntDir>
|
164
|
+
</PropertyGroup>
|
165
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
166
|
+
<LinkIncremental>false</LinkIncremental>
|
167
|
+
<OutDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\</OutDir>
|
168
|
+
<IntDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\</IntDir>
|
169
|
+
</PropertyGroup>
|
170
|
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
|
171
|
+
<LinkIncremental>false</LinkIncremental>
|
172
|
+
<OutDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\</OutDir>
|
173
|
+
<IntDir>$(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\</IntDir>
|
174
|
+
</PropertyGroup>
|
175
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
176
|
+
<ClCompile>
|
177
|
+
<PrecompiledHeader>
|
178
|
+
</PrecompiledHeader>
|
179
|
+
<WarningLevel>Level3</WarningLevel>
|
180
|
+
<Optimization>Disabled</Optimization>
|
181
|
+
<PreprocessorDefinitions>SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
182
|
+
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
183
|
+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
184
|
+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
185
|
+
</ClCompile>
|
186
|
+
<Link>
|
187
|
+
<SubSystem>Console</SubSystem>
|
188
|
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
189
|
+
</Link>
|
190
|
+
</ItemDefinitionGroup>
|
191
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
|
192
|
+
<ClCompile>
|
193
|
+
<PrecompiledHeader>
|
194
|
+
</PrecompiledHeader>
|
195
|
+
<WarningLevel>Level3</WarningLevel>
|
196
|
+
<Optimization>Disabled</Optimization>
|
197
|
+
<PreprocessorDefinitions>SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
198
|
+
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
199
|
+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
200
|
+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
201
|
+
</ClCompile>
|
202
|
+
<Link>
|
203
|
+
<SubSystem>Console</SubSystem>
|
204
|
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
205
|
+
</Link>
|
206
|
+
</ItemDefinitionGroup>
|
207
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
208
|
+
<ClCompile>
|
209
|
+
<PrecompiledHeader>
|
210
|
+
</PrecompiledHeader>
|
211
|
+
<WarningLevel>Level3</WarningLevel>
|
212
|
+
<Optimization>Disabled</Optimization>
|
213
|
+
<PreprocessorDefinitions>SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
214
|
+
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
215
|
+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
216
|
+
</ClCompile>
|
217
|
+
<Link>
|
218
|
+
<SubSystem>Console</SubSystem>
|
219
|
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
220
|
+
</Link>
|
221
|
+
</ItemDefinitionGroup>
|
222
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
|
223
|
+
<ClCompile>
|
224
|
+
<PrecompiledHeader>
|
225
|
+
</PrecompiledHeader>
|
226
|
+
<WarningLevel>Level3</WarningLevel>
|
227
|
+
<Optimization>Disabled</Optimization>
|
228
|
+
<PreprocessorDefinitions>SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
229
|
+
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
230
|
+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
231
|
+
</ClCompile>
|
232
|
+
<Link>
|
233
|
+
<SubSystem>Console</SubSystem>
|
234
|
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
235
|
+
</Link>
|
236
|
+
</ItemDefinitionGroup>
|
237
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
238
|
+
<ClCompile>
|
239
|
+
<WarningLevel>Level3</WarningLevel>
|
240
|
+
<PrecompiledHeader>
|
241
|
+
</PrecompiledHeader>
|
242
|
+
<Optimization>Full</Optimization>
|
243
|
+
<FunctionLevelLinking>true</FunctionLevelLinking>
|
244
|
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
245
|
+
<PreprocessorDefinitions>SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
246
|
+
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
247
|
+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
248
|
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
249
|
+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
250
|
+
</ClCompile>
|
251
|
+
<Link>
|
252
|
+
<SubSystem>Console</SubSystem>
|
253
|
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
254
|
+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
255
|
+
<OptimizeReferences>true</OptimizeReferences>
|
256
|
+
</Link>
|
257
|
+
</ItemDefinitionGroup>
|
258
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
|
259
|
+
<ClCompile>
|
260
|
+
<WarningLevel>Level3</WarningLevel>
|
261
|
+
<PrecompiledHeader>
|
262
|
+
</PrecompiledHeader>
|
263
|
+
<Optimization>Full</Optimization>
|
264
|
+
<FunctionLevelLinking>true</FunctionLevelLinking>
|
265
|
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
266
|
+
<PreprocessorDefinitions>SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
267
|
+
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
268
|
+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
269
|
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
270
|
+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
271
|
+
</ClCompile>
|
272
|
+
<Link>
|
273
|
+
<SubSystem>Console</SubSystem>
|
274
|
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
275
|
+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
276
|
+
<OptimizeReferences>true</OptimizeReferences>
|
277
|
+
</Link>
|
278
|
+
</ItemDefinitionGroup>
|
279
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
280
|
+
<ClCompile>
|
281
|
+
<WarningLevel>Level3</WarningLevel>
|
282
|
+
<PrecompiledHeader>
|
283
|
+
</PrecompiledHeader>
|
284
|
+
<Optimization>MaxSpeed</Optimization>
|
285
|
+
<FunctionLevelLinking>true</FunctionLevelLinking>
|
286
|
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
287
|
+
<PreprocessorDefinitions>SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
288
|
+
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
289
|
+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
290
|
+
</ClCompile>
|
291
|
+
<Link>
|
292
|
+
<SubSystem>Console</SubSystem>
|
293
|
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
294
|
+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
295
|
+
<OptimizeReferences>true</OptimizeReferences>
|
296
|
+
</Link>
|
297
|
+
</ItemDefinitionGroup>
|
298
|
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
|
299
|
+
<ClCompile>
|
300
|
+
<WarningLevel>Level3</WarningLevel>
|
301
|
+
<PrecompiledHeader>
|
302
|
+
</PrecompiledHeader>
|
303
|
+
<Optimization>MaxSpeed</Optimization>
|
304
|
+
<FunctionLevelLinking>true</FunctionLevelLinking>
|
305
|
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
306
|
+
<PreprocessorDefinitions>SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
307
|
+
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
308
|
+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
309
|
+
</ClCompile>
|
310
|
+
<Link>
|
311
|
+
<SubSystem>Console</SubSystem>
|
312
|
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
313
|
+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
314
|
+
<OptimizeReferences>true</OptimizeReferences>
|
315
|
+
</Link>
|
316
|
+
</ItemDefinitionGroup>
|
317
|
+
<ItemGroup>
|
318
|
+
|
319
|
+
</ItemGroup>
|
320
|
+
<ItemGroup>
|
321
|
+
|
322
|
+
</ItemGroup>
|
323
|
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
324
|
+
<ImportGroup Label="ExtensionTargets">
|
325
|
+
</ImportGroup>
|
326
|
+
</Project>
|