From c73b6c9ba513fea3e18b696e659049df69931171 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 11 Nov 2014 11:18:18 -0500 Subject: update to 1.0.0-1 version of the package --- AUTHORS | 3 - ChangeLog | 37 +++ LICENSE | 2 +- THANKS | 3 + builds/msvc/properties/Common.props | 4 +- builds/msvc/properties/Release.props | 4 +- builds/msvc/version.h | 6 +- builds/msvc/vs2010/libsodium/libsodium.vcxproj | 12 +- .../vs2010/libsodium/libsodium.vcxproj.filters | 38 +-- builds/msvc/vs2010/test/test.vcxproj | 14 +- builds/msvc/vs2010/test/test.vcxproj.filters | 14 +- builds/msvc/vs2012/libsodium/libsodium.vcxproj | 12 +- .../vs2012/libsodium/libsodium.vcxproj.filters | 38 +-- builds/msvc/vs2012/test/test.vcxproj | 14 +- builds/msvc/vs2012/test/test.vcxproj.filters | 14 +- builds/msvc/vs2013/libsodium/libsodium.vcxproj | 12 +- .../vs2013/libsodium/libsodium.vcxproj.filters | 38 +-- builds/msvc/vs2013/test/test.vcxproj | 14 +- builds/msvc/vs2013/test/test.vcxproj.filters | 14 +- configure.ac | 56 ++-- debian/changelog | 10 +- debian/clean | 1 + debian/control | 8 +- debian/copyright | 40 ++- debian/gbp.conf | 7 - debian/libsodium10.docs | 3 - debian/libsodium10.install | 1 - debian/libsodium10.symbols | 306 ----------------- debian/libsodium13.docs | 3 + debian/libsodium13.install | 1 + debian/libsodium13.symbols | 305 +++++++++++++++++ dist-build/android-build.sh | 1 + dist-build/emscripten.sh | 4 +- dist-build/ios.sh | 1 + libsodium.pc.in | 2 +- libsodium.vcxproj | 6 +- libsodium.vcxproj.filters | 14 +- msvc-scripts/process.bat | 6 +- msvc-scripts/sodium.props | 5 +- packaging/nuget/package.config | 2 +- packaging/nuget/package.nuspec | 50 +-- packaging/nuget/package.targets | 40 +-- src/libsodium/Makefile.am | 11 +- .../sodium/aead_chacha20poly1305.c | 2 + .../crypto_auth/hmacsha256/cp/verify_hmacsha256.c | 4 +- .../crypto_auth/hmacsha512/cp/verify_hmacsha512.c | 4 +- .../hmacsha512256/cp/verify_hmacsha512256.c | 4 +- src/libsodium/crypto_auth/try.c | 119 ------- src/libsodium/crypto_box/crypto_box_easy.c | 7 + .../ref/keypair_curve25519xsalsa20poly1305.c | 2 +- src/libsodium/crypto_box/try.c | 195 ----------- .../crypto_generichash/blake2/ref/blake2-impl.h | 13 +- .../crypto_generichash/blake2/ref/blake2b-ref.c | 7 +- .../crypto_generichash/blake2/ref/blake2s-ref.c | 356 -------------------- .../blake2/ref/generichash_blake2b.c | 8 +- src/libsodium/crypto_hash/sha256/cp/hash_sha256.c | 2 + src/libsodium/crypto_hash/sha512/cp/hash_sha512.c | 2 + src/libsodium/crypto_hash/try.c | 76 ----- .../poly1305/donna/auth_poly1305_donna.c | 3 +- .../poly1305/onetimeauth_poly1305.c | 2 + .../scryptsalsa208sha256/crypto_scrypt-common.c | 26 +- .../scryptsalsa208sha256/pbkdf2-sha256.c | 55 ++-- .../pwhash_scryptsalsa208sha256.c | 34 +- .../scryptsalsa208sha256/scrypt_platform.c | 4 +- .../sse/pwhash_scryptsalsa208sha256_sse.c | 4 +- .../crypto_scalarmult/curve25519/ref10/pow225521.h | 4 +- src/libsodium/crypto_scalarmult/try.c | 125 ------- .../crypto_secretbox/crypto_secretbox_easy.c | 6 +- src/libsodium/crypto_secretbox/try.c | 129 -------- src/libsodium/crypto_sign/ed25519/ref10/keypair.c | 49 ++- src/libsodium/crypto_sign/ed25519/ref10/open.c | 12 +- src/libsodium/crypto_sign/ed25519/ref10/sign.c | 18 +- .../crypto_sign/ed25519/sign_ed25519_api.c | 18 + .../ref/sign_edwards25519sha512batch.c | 2 +- src/libsodium/crypto_sign/try.c | 87 ----- .../aes256estream/hongjun/aes-table-be.h | 273 ---------------- .../aes256estream/hongjun/aes-table-le.h | 274 ---------------- .../aes256estream/hongjun/aes-table.h | 62 ---- .../aes256estream/hongjun/aes256-ctr.c | 239 -------------- .../crypto_stream/aes256estream/hongjun/aes256.h | 171 ---------- .../crypto_stream/aes256estream/hongjun/api.h | 13 - .../aes256estream/hongjun/ecrypt-sync.h | 27 -- .../aes256estream/stream_aes256estream_api.c | 16 - .../chacha20/ref/stream_chacha20_ref.c | 5 +- src/libsodium/crypto_stream/try.c | 122 ------- src/libsodium/crypto_verify/try.c | 76 ----- src/libsodium/include/Makefile.am | 1 - src/libsodium/include/sodium.h | 1 - .../include/sodium/crypto_onetimeauth_poly1305.h | 3 +- .../sodium/crypto_pwhash_scryptsalsa208sha256.h | 5 + src/libsodium/include/sodium/crypto_sign_ed25519.h | 15 + .../include/sodium/crypto_stream_aes256estream.h | 67 ---- src/libsodium/include/sodium/randombytes.h | 18 +- src/libsodium/include/sodium/utils.h | 57 +++- .../salsa20/randombytes_salsa20_random.c | 46 ++- .../randombytes/sysrandom/randombytes_sysrandom.c | 18 +- src/libsodium/sodium/compat.c | 361 --------------------- src/libsodium/sodium/core.c | 4 +- src/libsodium/sodium/runtime.c | 6 +- src/libsodium/sodium/utils.c | 340 +++++++++++++++++-- test/default/Makefile.am | 44 ++- test/default/aead_chacha20poly1305.c | 68 ++-- test/default/aead_chacha20poly1305.exp | 8 + test/default/auth.c | 57 +++- test/default/auth.exp | 22 ++ test/default/auth2.c | 43 ++- test/default/auth2.exp | 4 + test/default/auth3.c | 42 +-- test/default/auth3.exp | 1 + test/default/auth5.c | 48 +-- test/default/auth5.exp | 0 test/default/auth6.c | 17 +- test/default/auth6.exp | 8 + test/default/auth7.c | 48 +-- test/default/auth7.exp | 0 test/default/box.c | 125 ++++--- test/default/box.exp | 38 +++ test/default/box2.c | 99 +++--- test/default/box2.exp | 34 ++ test/default/box7.c | 38 ++- test/default/box7.exp | 0 test/default/box8.c | 52 +-- test/default/box8.exp | 0 test/default/box_easy.c | 74 ++--- test/default/box_easy.exp | 19 ++ test/default/box_easy2.c | 8 +- test/default/box_easy2.exp | 2 + test/default/box_seed.c | 40 +-- test/default/box_seed.exp | 8 + test/default/chacha20.c | 62 ++-- test/default/chacha20.exp | 8 + test/default/cmptest.h | 4 + test/default/core1.c | 45 +-- test/default/core1.exp | 4 + test/default/core2.c | 47 +-- test/default/core2.exp | 4 + test/default/core3.c | 56 ++-- test/default/core3.exp | 1 + test/default/core4.c | 45 ++- test/default/core4.exp | 8 + test/default/core5.c | 40 +-- test/default/core5.exp | 4 + test/default/core6.c | 67 ++-- test/default/core6.exp | 4 + test/default/ed25519_convert.c | 44 +++ test/default/ed25519_convert.exp | 3 + test/default/generichash.c | 74 ++++- test/default/generichash.exp | 66 ++++ test/default/generichash2.c | 43 ++- test/default/generichash2.exp | 64 ++++ test/default/generichash3.c | 178 ++++++++-- test/default/generichash3.exp | 75 +++++ test/default/hash.c | 37 ++- test/default/hash.exp | 4 + test/default/hash2.exp | 1 + test/default/hash3.c | 17 +- test/default/hash3.exp | 1 + test/default/onetimeauth.c | 80 +++-- test/default/onetimeauth.exp | 4 + test/default/onetimeauth2.c | 52 ++- test/default/onetimeauth2.exp | 1 + test/default/onetimeauth7.c | 48 +-- test/default/onetimeauth7.exp | 0 test/default/pwhash.c | 344 ++++++++++++++++---- test/default/pwhash.exp | 31 ++ test/default/pwhash_scrypt_ll.c | 68 ++-- test/default/pwhash_scrypt_ll.exp | 15 + test/default/randombytes.c | 93 +++++- test/default/randombytes.exp | 1 + test/default/scalarmult.c | 43 ++- test/default/scalarmult.exp | 4 + test/default/scalarmult2.c | 35 +- test/default/scalarmult2.exp | 4 + test/default/scalarmult5.c | 45 +-- test/default/scalarmult5.exp | 4 + test/default/scalarmult6.c | 45 +-- test/default/scalarmult6.exp | 4 + test/default/scalarmult7.c | 31 ++ test/default/scalarmult7.exp | 1 + test/default/secretbox.c | 95 +++--- test/default/secretbox.exp | 19 ++ test/default/secretbox2.c | 77 ++--- test/default/secretbox2.exp | 17 + test/default/secretbox7.c | 36 +- test/default/secretbox7.exp | 0 test/default/secretbox8.c | 50 +-- test/default/secretbox8.exp | 0 test/default/secretbox_easy.c | 98 +++--- test/default/secretbox_easy.exp | 38 +++ test/default/secretbox_easy2.c | 8 +- test/default/secretbox_easy2.exp | 2 + test/default/shorthash.c | 27 +- test/default/shorthash.exp | 64 ++++ test/default/sign.c | 114 +++++-- test/default/sign.exp | 3 + test/default/sodium_core.c | 9 +- test/default/sodium_core.exp | 1 + test/default/sodium_utils.c | 85 +++-- test/default/sodium_utils.exp | 13 + test/default/sodium_utils2.c | 72 ++++ test/default/sodium_utils2.exp | 3 + test/default/sodium_utils3.c | 50 +++ test/default/sodium_utils3.exp | 2 + test/default/sodium_version.c | 9 +- test/default/sodium_version.exp | 3 + test/default/stream.c | 40 ++- test/default/stream.exp | 1 + test/default/stream2.c | 32 +- test/default/stream2.exp | 1 + test/default/stream3.c | 36 +- test/default/stream3.exp | 4 + test/default/stream4.c | 81 ++--- test/default/stream4.exp | 17 + test/default/stream5.c | 29 -- test/default/stream6.c | 54 --- test/default/verify1.c | 38 ++- test/default/verify1.exp | 6 + 217 files changed, 3993 insertions(+), 4922 deletions(-) create mode 100644 debian/clean delete mode 100644 debian/gbp.conf delete mode 100644 debian/libsodium10.docs delete mode 100644 debian/libsodium10.install delete mode 100644 debian/libsodium10.symbols create mode 100644 debian/libsodium13.docs create mode 100644 debian/libsodium13.install create mode 100644 debian/libsodium13.symbols delete mode 100644 src/libsodium/crypto_auth/try.c delete mode 100644 src/libsodium/crypto_box/try.c delete mode 100644 src/libsodium/crypto_generichash/blake2/ref/blake2s-ref.c delete mode 100644 src/libsodium/crypto_hash/try.c delete mode 100644 src/libsodium/crypto_scalarmult/try.c delete mode 100644 src/libsodium/crypto_secretbox/try.c delete mode 100644 src/libsodium/crypto_sign/try.c delete mode 100644 src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-be.h delete mode 100644 src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-le.h delete mode 100644 src/libsodium/crypto_stream/aes256estream/hongjun/aes-table.h delete mode 100644 src/libsodium/crypto_stream/aes256estream/hongjun/aes256-ctr.c delete mode 100644 src/libsodium/crypto_stream/aes256estream/hongjun/aes256.h delete mode 100644 src/libsodium/crypto_stream/aes256estream/hongjun/api.h delete mode 100644 src/libsodium/crypto_stream/aes256estream/hongjun/ecrypt-sync.h delete mode 100644 src/libsodium/crypto_stream/aes256estream/stream_aes256estream_api.c delete mode 100644 src/libsodium/crypto_stream/try.c delete mode 100644 src/libsodium/crypto_verify/try.c delete mode 100644 src/libsodium/include/sodium/crypto_stream_aes256estream.h delete mode 100644 src/libsodium/sodium/compat.c create mode 100644 test/default/aead_chacha20poly1305.exp create mode 100644 test/default/auth.exp create mode 100644 test/default/auth2.exp create mode 100644 test/default/auth3.exp create mode 100644 test/default/auth5.exp create mode 100644 test/default/auth6.exp create mode 100644 test/default/auth7.exp create mode 100644 test/default/box.exp create mode 100644 test/default/box2.exp create mode 100644 test/default/box7.exp create mode 100644 test/default/box8.exp create mode 100644 test/default/box_easy.exp create mode 100644 test/default/box_easy2.exp create mode 100644 test/default/box_seed.exp create mode 100644 test/default/chacha20.exp create mode 100644 test/default/core1.exp create mode 100644 test/default/core2.exp create mode 100644 test/default/core3.exp create mode 100644 test/default/core4.exp create mode 100644 test/default/core5.exp create mode 100644 test/default/core6.exp create mode 100644 test/default/ed25519_convert.c create mode 100644 test/default/ed25519_convert.exp create mode 100644 test/default/generichash.exp create mode 100644 test/default/generichash2.exp create mode 100644 test/default/generichash3.exp create mode 100644 test/default/hash.exp create mode 100644 test/default/hash2.exp create mode 100644 test/default/hash3.exp create mode 100644 test/default/onetimeauth.exp create mode 100644 test/default/onetimeauth2.exp create mode 100644 test/default/onetimeauth7.exp create mode 100644 test/default/pwhash.exp create mode 100644 test/default/pwhash_scrypt_ll.exp create mode 100644 test/default/randombytes.exp create mode 100644 test/default/scalarmult.exp create mode 100644 test/default/scalarmult2.exp create mode 100644 test/default/scalarmult5.exp create mode 100644 test/default/scalarmult6.exp create mode 100644 test/default/scalarmult7.c create mode 100644 test/default/scalarmult7.exp create mode 100644 test/default/secretbox.exp create mode 100644 test/default/secretbox2.exp create mode 100644 test/default/secretbox7.exp create mode 100644 test/default/secretbox8.exp create mode 100644 test/default/secretbox_easy.exp create mode 100644 test/default/secretbox_easy2.exp create mode 100644 test/default/shorthash.exp create mode 100644 test/default/sign.exp create mode 100644 test/default/sodium_core.exp create mode 100644 test/default/sodium_utils.exp create mode 100644 test/default/sodium_utils2.c create mode 100644 test/default/sodium_utils2.exp create mode 100644 test/default/sodium_utils3.c create mode 100644 test/default/sodium_utils3.exp create mode 100644 test/default/sodium_version.exp create mode 100644 test/default/stream.exp create mode 100644 test/default/stream2.exp create mode 100644 test/default/stream3.exp create mode 100644 test/default/stream4.exp delete mode 100644 test/default/stream5.c delete mode 100644 test/default/stream6.c create mode 100644 test/default/verify1.exp diff --git a/AUTHORS b/AUTHORS index 361aa49..6208f0e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -63,9 +63,6 @@ crypto_sign/ed25519 Peter Schwabe crypto_stream/aes128ctr Peter Schwabe -crypto_stream/aes256estream Hongjun Wu - Frank Denis - crypto_stream/chacha20 Daniel J. Bernstein crypto_stream/salsa20 Daniel J. Bernstein diff --git a/ChangeLog b/ChangeLog index b8ddb0b..42bd744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,41 @@ +* Version 1.0.0 + - The API and ABI are now stable. New features will be added, but +backward-compatibility is guaranteed through all the 1.x.y releases. + - crypto_sign() properly works with overlapping regions again. Thanks +to @pysiak for reporting this regression introduced in version 0.6.1. + - The test suite has been extended. + +* Version 0.7.1 (1.0 RC2) + - This is the second release candidate of Sodium 1.0. Minor +compilation, readability and portability changes have been made and the +test suite was improved, but the API is the same as the previous release +candidate. + +* Version 0.7.0 (1.0 RC1) + - Allocating memory to store sensitive data can now be done using +sodium_malloc() and sodium_allocarray(). These functions add guard +pages around the protected data to make it less likely to be +accessible in a heartbleed-like scenario. In addition, the protection +for memory regions allocated that way can be changed using +sodium_mprotect_noaccess(), sodium_mprotect_readonly() and +sodium_mprotect_readwrite(). + - ed25519 keys can be converted to curve25519 keys with +crypto_sign_ed25519_pk_to_curve25519() and +crypto_sign_ed25519_sk_to_curve25519(). This allows using the same +keys for signature and encryption. + - The seed and the public key can be extracted from an ed25519 key +using crypto_sign_ed25519_sk_to_seed() and crypto_sign_ed25519_sk_to_pk(). + - aes256 was removed. A timing-attack resistant implementation might +be added later, but not before version 1.0 is tagged. + - The crypto_pwhash_scryptxsalsa208sha256_* compatibility layer was +removed. Use crypto_pwhash_scryptsalsa208sha256_*. + - The compatibility layer for implementation-specific functions was +removed. + - Compilation issues with Mingw64 on MSYS (not MSYS2) were fixed. + - crypto_pwhash_scryptsalsa208sha256_STRPREFIX was added: it contains +the prefix produced by crypto_pwhash_scryptsalsa208sha256_str() + * Version 0.6.1 - Important bug fix: when crypto_sign_open() was given a signed message too short to even contain a signature, it was putting an diff --git a/LICENSE b/LICENSE index 9a56e63..d4d12ef 100644 --- a/LICENSE +++ b/LICENSE @@ -2,7 +2,7 @@ * Copyright (c) 2013-2014 * Frank Denis * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/THANKS b/THANKS index 78f2784..2df2bad 100644 --- a/THANKS +++ b/THANKS @@ -2,6 +2,7 @@ @dnaq @joshjdevl @jshahbazi +@lvh @neheb Amit Murthy (@amitmurthy) Bruno Oliveira (@abstractj) @@ -14,11 +15,13 @@ Eric Voskuil (@evoskuil) Gabriel Handford (@gabriel) Jachym Holecek (@freza) Jan de Muijnck-Hughes (@jfdm) +Jason McCampbell (@jasonmccampbell) Jeroen Habraken (@VeXocide) Joseph Abrahamson (@tel) Kenneth Ballenegger (@kballenegger) Michael Gorlick (@mgorlick) Michael Gregorowicz (@mgregoro) +Omar Ayub (@electricFeel) Pedro Paixao (@paixaop) Ruben De Visscher (@rubendv) Samuel Neves (@sneves) diff --git a/builds/msvc/properties/Common.props b/builds/msvc/properties/Common.props index 72588d6..6e10d88 100644 --- a/builds/msvc/properties/Common.props +++ b/builds/msvc/properties/Common.props @@ -14,8 +14,10 @@ true UNICODE;_UNICODE;%(PreprocessorDefinitions) + NATIVE_LITTLE_ENDIAN=1;%(PreprocessorDefinitions) + inline=__inline;%(PreprocessorDefinitions) Level3 - \ No newline at end of file + diff --git a/builds/msvc/properties/Release.props b/builds/msvc/properties/Release.props index 1c5415b..296dbfe 100644 --- a/builds/msvc/properties/Release.props +++ b/builds/msvc/properties/Release.props @@ -20,10 +20,8 @@ OnlyExplicitInline false MaxSpeed - NDEBUG;%(PreprocessorDefinitions) - NDEBUG;%(PreprocessorDefinitions) true @@ -38,4 +36,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/version.h b/builds/msvc/version.h index ca13a74..da4fd43 100644 --- a/builds/msvc/version.h +++ b/builds/msvc/version.h @@ -4,10 +4,10 @@ #include "export.h" -#define SODIUM_VERSION_STRING "0.6.1" +#define SODIUM_VERSION_STRING "1.0.0" -#define SODIUM_LIBRARY_VERSION_MAJOR 6 -#define SODIUM_LIBRARY_VERSION_MINOR 1 +#define SODIUM_LIBRARY_VERSION_MAJOR 7 +#define SODIUM_LIBRARY_VERSION_MINOR 2 #ifdef __cplusplus extern "C" { diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj index 95b0006..04c8950 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -130,7 +130,6 @@ - @@ -303,14 +302,6 @@ - - - - - - - - @@ -338,7 +329,6 @@ - @@ -362,4 +352,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters index 13805be..438508a 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters @@ -94,9 +94,6 @@ include\sodium - - include\sodium - include\sodium @@ -154,9 +151,6 @@ include\sodium - - src\crypto_stream\aes256estream\hongjun - src\crypto_box\curve25519xsalsa20poly1305\ref @@ -427,9 +421,6 @@ src\crypto_stream\aes128ctr - - src\crypto_stream\aes256estream - src\crypto_stream\salsa20 @@ -493,9 +484,6 @@ src\crypto_auth\hmacsha512256\cp - - src\sodium - src\sodium @@ -532,18 +520,6 @@ src\randombytes\sysrandom - - src\crypto_stream\aes256estream\hongjun - - - src\crypto_stream\aes256estream\hongjun - - - src\crypto_stream\aes256estream\hongjun - - - src\crypto_stream\aes256estream\hongjun - src\crypto_auth\hmacsha512 @@ -565,9 +541,6 @@ src\crypto_pwhash\scryptsalsa208sha256 - - src\crypto_stream\aes256estream\hongjun - src\crypto_sign\ed25519\ref10 @@ -676,9 +649,6 @@ src\crypto_stream\aes128ctr\portable - - src\crypto_stream\aes256estream\hongjun - src\crypto_verify\16\ref @@ -946,9 +916,6 @@ {ca40b775-e025-4359-87ae-02c771c1a222} - - {afb86556-101b-407c-93f6-db784a9e3f4f} - {91c31952-2f36-418e-aa07-68ed57057d0f} @@ -970,9 +937,6 @@ {1c006197-b25b-48e8-833f-2dd59a571b9d} - - {3acc42ca-4646-462d-bbac-2a07e9eb30be} - {46eb8265-dc41-4289-aa7d-c1918e05cf75} @@ -1111,4 +1075,4 @@ src\crypto_aead\chacha20poly1305\sodium - \ No newline at end of file + diff --git a/builds/msvc/vs2010/test/test.vcxproj b/builds/msvc/vs2010/test/test.vcxproj index 2cd94c3..4c8f931 100644 --- a/builds/msvc/vs2010/test/test.vcxproj +++ b/builds/msvc/vs2010/test/test.vcxproj @@ -112,6 +112,9 @@ true + + true + true @@ -154,6 +157,9 @@ true + + true + true @@ -184,6 +190,12 @@ true + + true + + + true + true @@ -211,4 +223,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2010/test/test.vcxproj.filters b/builds/msvc/vs2010/test/test.vcxproj.filters index c0819e8..42b8528 100644 --- a/builds/msvc/vs2010/test/test.vcxproj.filters +++ b/builds/msvc/vs2010/test/test.vcxproj.filters @@ -49,6 +49,9 @@ src + + src + src @@ -88,6 +91,9 @@ src + + src + src @@ -115,6 +121,12 @@ src + + src + + + src + src @@ -159,4 +171,4 @@ {5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea} - \ No newline at end of file + diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj index f47a042..d6edfc4 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -130,7 +130,6 @@ - @@ -303,14 +302,6 @@ - - - - - - - - @@ -338,7 +329,6 @@ - @@ -362,4 +352,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters index 13805be..438508a 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters @@ -94,9 +94,6 @@ include\sodium - - include\sodium - include\sodium @@ -154,9 +151,6 @@ include\sodium - - src\crypto_stream\aes256estream\hongjun - src\crypto_box\curve25519xsalsa20poly1305\ref @@ -427,9 +421,6 @@ src\crypto_stream\aes128ctr - - src\crypto_stream\aes256estream - src\crypto_stream\salsa20 @@ -493,9 +484,6 @@ src\crypto_auth\hmacsha512256\cp - - src\sodium - src\sodium @@ -532,18 +520,6 @@ src\randombytes\sysrandom - - src\crypto_stream\aes256estream\hongjun - - - src\crypto_stream\aes256estream\hongjun - - - src\crypto_stream\aes256estream\hongjun - - - src\crypto_stream\aes256estream\hongjun - src\crypto_auth\hmacsha512 @@ -565,9 +541,6 @@ src\crypto_pwhash\scryptsalsa208sha256 - - src\crypto_stream\aes256estream\hongjun - src\crypto_sign\ed25519\ref10 @@ -676,9 +649,6 @@ src\crypto_stream\aes128ctr\portable - - src\crypto_stream\aes256estream\hongjun - src\crypto_verify\16\ref @@ -946,9 +916,6 @@ {ca40b775-e025-4359-87ae-02c771c1a222} - - {afb86556-101b-407c-93f6-db784a9e3f4f} - {91c31952-2f36-418e-aa07-68ed57057d0f} @@ -970,9 +937,6 @@ {1c006197-b25b-48e8-833f-2dd59a571b9d} - - {3acc42ca-4646-462d-bbac-2a07e9eb30be} - {46eb8265-dc41-4289-aa7d-c1918e05cf75} @@ -1111,4 +1075,4 @@ src\crypto_aead\chacha20poly1305\sodium - \ No newline at end of file + diff --git a/builds/msvc/vs2012/test/test.vcxproj b/builds/msvc/vs2012/test/test.vcxproj index 65fd4d8..dcde649 100644 --- a/builds/msvc/vs2012/test/test.vcxproj +++ b/builds/msvc/vs2012/test/test.vcxproj @@ -112,6 +112,9 @@ true + + true + true @@ -154,6 +157,9 @@ true + + true + true @@ -184,6 +190,12 @@ true + + true + + + true + true @@ -211,4 +223,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2012/test/test.vcxproj.filters b/builds/msvc/vs2012/test/test.vcxproj.filters index c0819e8..42b8528 100644 --- a/builds/msvc/vs2012/test/test.vcxproj.filters +++ b/builds/msvc/vs2012/test/test.vcxproj.filters @@ -49,6 +49,9 @@ src + + src + src @@ -88,6 +91,9 @@ src + + src + src @@ -115,6 +121,12 @@ src + + src + + + src + src @@ -159,4 +171,4 @@ {5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea} - \ No newline at end of file + diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index 022bbe7..bd30e82 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -130,7 +130,6 @@ - @@ -303,14 +302,6 @@ - - - - - - - - @@ -338,7 +329,6 @@ - @@ -362,4 +352,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters index 13805be..438508a 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters @@ -94,9 +94,6 @@ include\sodium - - include\sodium - include\sodium @@ -154,9 +151,6 @@ include\sodium - - src\crypto_stream\aes256estream\hongjun - src\crypto_box\curve25519xsalsa20poly1305\ref @@ -427,9 +421,6 @@ src\crypto_stream\aes128ctr - - src\crypto_stream\aes256estream - src\crypto_stream\salsa20 @@ -493,9 +484,6 @@ src\crypto_auth\hmacsha512256\cp - - src\sodium - src\sodium @@ -532,18 +520,6 @@ src\randombytes\sysrandom - - src\crypto_stream\aes256estream\hongjun - - - src\crypto_stream\aes256estream\hongjun - - - src\crypto_stream\aes256estream\hongjun - - - src\crypto_stream\aes256estream\hongjun - src\crypto_auth\hmacsha512 @@ -565,9 +541,6 @@ src\crypto_pwhash\scryptsalsa208sha256 - - src\crypto_stream\aes256estream\hongjun - src\crypto_sign\ed25519\ref10 @@ -676,9 +649,6 @@ src\crypto_stream\aes128ctr\portable - - src\crypto_stream\aes256estream\hongjun - src\crypto_verify\16\ref @@ -946,9 +916,6 @@ {ca40b775-e025-4359-87ae-02c771c1a222} - - {afb86556-101b-407c-93f6-db784a9e3f4f} - {91c31952-2f36-418e-aa07-68ed57057d0f} @@ -970,9 +937,6 @@ {1c006197-b25b-48e8-833f-2dd59a571b9d} - - {3acc42ca-4646-462d-bbac-2a07e9eb30be} - {46eb8265-dc41-4289-aa7d-c1918e05cf75} @@ -1111,4 +1075,4 @@ src\crypto_aead\chacha20poly1305\sodium - \ No newline at end of file + diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj index 780396e..04f12bc 100644 --- a/builds/msvc/vs2013/test/test.vcxproj +++ b/builds/msvc/vs2013/test/test.vcxproj @@ -112,6 +112,9 @@ true + + true + true @@ -154,6 +157,9 @@ true + + true + true @@ -184,6 +190,12 @@ true + + true + + + true + true @@ -211,4 +223,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2013/test/test.vcxproj.filters b/builds/msvc/vs2013/test/test.vcxproj.filters index c0819e8..42b8528 100644 --- a/builds/msvc/vs2013/test/test.vcxproj.filters +++ b/builds/msvc/vs2013/test/test.vcxproj.filters @@ -49,6 +49,9 @@ src + + src + src @@ -88,6 +91,9 @@ src + + src + src @@ -115,6 +121,12 @@ src + + src + + + src + src @@ -159,4 +171,4 @@ {5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea} - \ No newline at end of file + diff --git a/configure.ac b/configure.ac index 773c0d3..359021f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.65]) -AC_INIT([libsodium],[0.6.1], +AC_INIT([libsodium],[1.0.0], [https://github.com/jedisct1/libsodium/issues], [libsodium], [https://github.com/jedisct1/libsodium]) @@ -15,10 +15,10 @@ AC_SUBST(VERSION) ISODATE=`date +%Y-%m-%d` AC_SUBST(ISODATE) -SODIUM_LIBRARY_VERSION_MAJOR=6 -SODIUM_LIBRARY_VERSION_MINOR=1 -DLL_VERSION=5 -SODIUM_LIBRARY_VERSION=12:0:2 +SODIUM_LIBRARY_VERSION_MAJOR=7 +SODIUM_LIBRARY_VERSION_MINOR=2 +DLL_VERSION=6 +SODIUM_LIBRARY_VERSION=13:2:0 # | | | # +------+ | +---+ # | | | @@ -70,13 +70,11 @@ AS_IF([test "x$EMSCRIPTEN" != "x"],[ AC_MSG_WARN([compiling to javascript - asm implementations disabled]) ]) -AS_CASE([$host], [x86_64-*-mingw* | x86_64-*-cygwin*], [enable_asm="no"]) - AC_ARG_ENABLE(pie, [AS_HELP_STRING(--disable-pie,Do not produce position independent executables)], enable_pie=$enableval, enable_pie="maybe") -AS_CASE([$host_os], [mingw*], [enable_pie="no"]) +AS_CASE([$host_os], [mingw*|cygwin*|msys], [enable_pie="no"]) AC_ARG_ENABLE(blocking-random, [AS_HELP_STRING(--enable-blocking-random,Use /dev/random instead of /dev/urandom)], @@ -142,10 +140,12 @@ CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [CFLAGS="$CFLAGS -fvisibility=hidden"]) -AX_CHECK_COMPILE_FLAG([-fPIC], [ - AX_CHECK_LINK_FLAG([-fPIC], - [CFLAGS="$CFLAGS -fPIC"] - ) +AS_CASE([$host_os], [cygwin*|mingw*|msys|pw32*|cegcc*], [ ], [ + AX_CHECK_COMPILE_FLAG([-fPIC], [ + AX_CHECK_LINK_FLAG([-fPIC], + [CFLAGS="$CFLAGS -fPIC"] + ) + ]) ]) AS_IF([test "$enable_pie" != "no"],[ @@ -165,7 +165,7 @@ AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], [CFLAGS="$CFLAGS -fno-strict-overf LIBTOOL_OLD_FLAGS="$LIBTOOL_EXTRA_FLAGS" LIBTOOL_EXTRA_FLAGS="$LIBTOOL_EXTRA_FLAGS -version-info $SODIUM_LIBRARY_VERSION" AC_ARG_ENABLE(soname-versions, - [AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for android) (default: enabled)])], + [AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for Android) (default: enabled)])], [ AS_IF([test "x$enableval" = "xno"], [ LIBTOOL_EXTRA_FLAGS="$LIBTOOL_OLD_FLAGS -avoid-version" @@ -174,7 +174,7 @@ AC_ARG_ENABLE(soname-versions, ) AS_CASE([$host_os], - [cygwin* | mingw* | pw32* | cegcc*], [ + [cygwin*|mingw*|msys|pw32*|cegcc*], [ AX_CHECK_LINK_FLAG([-Wl,--dynamicbase], [LDFLAGS="$LDFLAGS -Wl,--dynamicbase"]) AX_CHECK_LINK_FLAG([-Wl,--nxcompat], [LDFLAGS="$LDFLAGS -Wl,--nxcompat"]) ]) @@ -182,20 +182,13 @@ AS_CASE([$host_os], AS_IF([test "x$enable_ssp" != "xno"],[ AS_CASE([$host_os], - [cygwin* | mingw* | pw32* | cegcc*], [ ], - [dragonfly*], [ + [cygwin*|mingw*|msys|pw32*|cegcc*], [ ], + [*], [ AX_CHECK_COMPILE_FLAG([-fstack-protector], [ AX_CHECK_LINK_FLAG([-fstack-protector], [CFLAGS="$CFLAGS -fstack-protector"] ) ]) - ], - [*], [ - AX_CHECK_COMPILE_FLAG([-fstack-protector-all], [ - AX_CHECK_LINK_FLAG([-fstack-protector-all], - [CFLAGS="$CFLAGS -fstack-protector-all"] - ) - ]) ]) ]) @@ -320,18 +313,21 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ HAVE_AMD64_ASM_V=0 AS_IF([test "$enable_asm" != "no"],[ - AC_MSG_CHECKING(whether we can assemble basic amd64 code) + AC_MSG_CHECKING(whether we should use x86_64 asm code) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) +# if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64) +# error Windows x86_64 calling conventions are not supported yet +# endif /* neat */ #else -# error !amd64 +# error !x86_64 #endif __asm__("pxor %xmm12,%xmm6"); ]])], [AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_AMD64_ASM], [1], [basic amd64 code can be assembled]) + AC_DEFINE([HAVE_AMD64_ASM], [1], [x86_64 asm code should be used]) HAVE_AMD64_ASM_V=1], [AC_MSG_RESULT(no)]) ]) @@ -406,14 +402,10 @@ AS_CASE([$host_cpu], dnl Checks for functions and headers -AC_CHECK_FUNC(clock_gettime, , [AC_CHECK_LIB(rt, clock_gettime)]) -AC_CHECK_FUNC(fegetenv, , [AC_CHECK_LIB(m, fegetenv)]) - AS_IF([test "x$EMSCRIPTEN" = "x"],[ AC_CHECK_FUNCS([arc4random arc4random_buf]) ]) -AC_CHECK_FUNCS([mlock VirtualLock]) -AC_CHECK_FUNCS([SecureZeroMemory explicit_bzero posix_memalign]) +AC_CHECK_FUNCS([mlock mprotect explicit_bzero posix_memalign]) AC_SUBST([LIBTOOL_EXTRA_FLAGS]) @@ -425,7 +417,7 @@ gl_LD_OUTPUT_DEF dnl Output. -AH_VERBATIM([NDEBUG], [/* Never ever ignore assertions */ +AH_VERBATIM([NDEBUG], [/* Always evaluate assert() calls */ #ifdef NDEBUG #/**/undef/**/ NDEBUG #endif]) diff --git a/debian/changelog b/debian/changelog index ca0f955..2ff77fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,6 @@ -libsodium (0.6.1-1~leap) unstable; urgency=medium - - * Remove _crypto_stream_salsa20 lines from libsodium10.symbols - - -- Micah Anderson Mon, 11 Aug 2014 14:48:43 -0400 - -libsodium (0.6.1-1) unstable; urgency=medium +libsodium (1.0.0-1) unstable; urgency=low * Initial release. (Closes: #701962: ITP: libsodium -- Library for build higher-level cryptographic tools) - -- Raúl Sánchez Siles Tue, 22 Jul 2014 00:49:38 +0200 + -- Laszlo Boszormenyi (GCS) Wed, 08 Oct 2014 18:54:15 +0000 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..3f7e4a3 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +build/config.log diff --git a/debian/control b/debian/control index f06c49a..f3cb17f 100644 --- a/debian/control +++ b/debian/control @@ -4,12 +4,12 @@ Priority: optional Build-Depends: debhelper ( >= 9), pkg-config, dh-autoreconf Maintainer: Laszlo Boszormenyi (GCS) Uploaders: Raúl Sánchez Siles -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Vcs-Hg: http://trismegisto.no-ip.org/hg/libsodium-debian Vcs-Browser: http://trismegisto.no-ip.org/hg/libsodium-debian Homepage: http://www.libsodium.org/ -Package: libsodium10 +Package: libsodium13 Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Architecture: any @@ -26,7 +26,7 @@ Description: Network communication, cryptography and signaturing library Package: libsodium-dev Section: libdevel -Depends: ${misc:Depends}, libsodium10 (= ${binary:Version}) +Depends: ${misc:Depends}, libsodium13 (= ${binary:Version}) Architecture: any Multi-Arch: same Description: Network communication, cryptography and signaturing library - headers @@ -45,7 +45,7 @@ Description: Network communication, cryptography and signaturing library - heade Package: libsodium-dbg Section: debug Priority: extra -Depends: ${misc:Depends}, libsodium10 (= ${binary:Version}) +Depends: ${misc:Depends}, libsodium13 (= ${binary:Version}) Architecture: any Multi-Arch: same Description: Network communication, cryptography and signaturing library - debug symbols diff --git a/debian/copyright b/debian/copyright index cb3ee84..b4c0ccc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -28,7 +28,7 @@ License: BSD-2-clause Files: src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c src/libsodium/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c Copyright: 2013 Alexander Peslyak -License: BSD +License: BSD-2-clause Files: src/libsodium/crypto_auth/hmacsha256/cp/hmac_hmacsha256.c src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha256.c @@ -99,6 +99,27 @@ License: CC0 You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see +Files: packaging/nuget/package.gsl +Copyright: 2013-2014 Frank Denis +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + Files: debian/* Copyright: 2014 Laszlo Boszormenyi (GCS) , 2013-2014 Raúl Sánchez Siles @@ -145,20 +166,3 @@ License: BSD-2-clause LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -License: BSD - Redistribution and use in source and binary forms, with or without - modification, are permitted. - . - THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index ae1dc36..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -upstream-branch = upstream -debian-branch = master -upstream-tag = upstream/%(version)s -debian-tag = debian/%(version)s -pristine-tar = True -sign-tags = True diff --git a/debian/libsodium10.docs b/debian/libsodium10.docs deleted file mode 100644 index 18afe51..0000000 --- a/debian/libsodium10.docs +++ /dev/null @@ -1,3 +0,0 @@ -AUTHORS -README.markdown -THANKS diff --git a/debian/libsodium10.install b/debian/libsodium10.install deleted file mode 100644 index 86ca402..0000000 --- a/debian/libsodium10.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/*/libsodium.so.* diff --git a/debian/libsodium10.symbols b/debian/libsodium10.symbols deleted file mode 100644 index 3777098..0000000 --- a/debian/libsodium10.symbols +++ /dev/null @@ -1,306 +0,0 @@ -libsodium.so.10 libsodium10 #MINVER# - crypto_aead_chacha20poly1305_abytes@Base 0.6.0 - crypto_aead_chacha20poly1305_decrypt@Base 0.6.0 - crypto_aead_chacha20poly1305_encrypt@Base 0.6.0 - crypto_aead_chacha20poly1305_keybytes@Base 0.6.0 - crypto_aead_chacha20poly1305_npubbytes@Base 0.6.0 - crypto_aead_chacha20poly1305_nsecbytes@Base 0.6.0 - crypto_auth@Base 0.6.0 - crypto_auth_bytes@Base 0.6.0 - crypto_auth_hmacsha256@Base 0.6.0 - crypto_auth_hmacsha256_bytes@Base 0.6.0 - crypto_auth_hmacsha256_final@Base 0.6.0 - crypto_auth_hmacsha256_init@Base 0.6.0 - crypto_auth_hmacsha256_keybytes@Base 0.6.0 - crypto_auth_hmacsha256_update@Base 0.6.0 - crypto_auth_hmacsha256_verify@Base 0.6.0 - crypto_auth_hmacsha512256@Base 0.6.0 - crypto_auth_hmacsha512256_bytes@Base 0.6.0 - crypto_auth_hmacsha512256_final@Base 0.6.0 - crypto_auth_hmacsha512256_init@Base 0.6.0 - crypto_auth_hmacsha512256_keybytes@Base 0.6.0 - crypto_auth_hmacsha512256_update@Base 0.6.0 - crypto_auth_hmacsha512256_verify@Base 0.6.0 - crypto_auth_hmacsha512@Base 0.6.0 - crypto_auth_hmacsha512_bytes@Base 0.6.0 - crypto_auth_hmacsha512_final@Base 0.6.0 - crypto_auth_hmacsha512_init@Base 0.6.0 - crypto_auth_hmacsha512_keybytes@Base 0.6.0 - crypto_auth_hmacsha512_update@Base 0.6.0 - crypto_auth_hmacsha512_verify@Base 0.6.0 - crypto_auth_keybytes@Base 0.6.0 - crypto_auth_primitive@Base 0.6.0 - crypto_auth_verify@Base 0.6.0 - crypto_box@Base 0.6.0 - crypto_box_afternm@Base 0.6.0 - crypto_box_beforenm@Base 0.6.0 - crypto_box_beforenmbytes@Base 0.6.0 - crypto_box_boxzerobytes@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_afternm@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_beforenm@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_beforenmbytes@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_boxzerobytes@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_keypair@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_macbytes@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_noncebytes@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_open@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_open_afternm@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_publickeybytes@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_secretkeybytes@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_seed_keypair@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_seedbytes@Base 0.6.0 - crypto_box_curve25519xsalsa20poly1305_zerobytes@Base 0.6.0 - crypto_box_detached@Base 0.6.0 - crypto_box_easy@Base 0.6.0 - crypto_box_keypair@Base 0.6.0 - crypto_box_macbytes@Base 0.6.0 - crypto_box_noncebytes@Base 0.6.0 - crypto_box_open@Base 0.6.0 - crypto_box_open_afternm@Base 0.6.0 - crypto_box_open_detached@Base 0.6.0 - crypto_box_open_easy@Base 0.6.0 - crypto_box_primitive@Base 0.6.0 - crypto_box_publickeybytes@Base 0.6.0 - crypto_box_secretkeybytes@Base 0.6.0 - crypto_box_seed_keypair@Base 0.6.0 - crypto_box_seedbytes@Base 0.6.0 - crypto_box_zerobytes@Base 0.6.0 - crypto_core_hsalsa20@Base 0.6.0 - crypto_core_hsalsa20_constbytes@Base 0.6.0 - crypto_core_hsalsa20_inputbytes@Base 0.6.0 - crypto_core_hsalsa20_keybytes@Base 0.6.0 - crypto_core_hsalsa20_outputbytes@Base 0.6.0 - crypto_core_salsa2012@Base 0.6.0 - crypto_core_salsa2012_constbytes@Base 0.6.0 - crypto_core_salsa2012_inputbytes@Base 0.6.0 - crypto_core_salsa2012_keybytes@Base 0.6.0 - crypto_core_salsa2012_outputbytes@Base 0.6.0 - crypto_core_salsa208@Base 0.6.0 - crypto_core_salsa208_constbytes@Base 0.6.0 - crypto_core_salsa208_inputbytes@Base 0.6.0 - crypto_core_salsa208_keybytes@Base 0.6.0 - crypto_core_salsa208_outputbytes@Base 0.6.0 - crypto_core_salsa20@Base 0.6.0 - crypto_core_salsa20_constbytes@Base 0.6.0 - crypto_core_salsa20_inputbytes@Base 0.6.0 - crypto_core_salsa20_keybytes@Base 0.6.0 - crypto_core_salsa20_outputbytes@Base 0.6.0 - crypto_generichash@Base 0.6.0 - crypto_generichash_blake2b@Base 0.6.0 - crypto_generichash_blake2b_bytes@Base 0.6.0 - crypto_generichash_blake2b_bytes_max@Base 0.6.0 - crypto_generichash_blake2b_bytes_min@Base 0.6.0 - crypto_generichash_blake2b_final@Base 0.6.0 - crypto_generichash_blake2b_init@Base 0.6.0 - crypto_generichash_blake2b_init_salt_personal@Base 0.6.0 - crypto_generichash_blake2b_keybytes@Base 0.6.0 - crypto_generichash_blake2b_keybytes_max@Base 0.6.0 - crypto_generichash_blake2b_keybytes_min@Base 0.6.0 - crypto_generichash_blake2b_personalbytes@Base 0.6.0 - crypto_generichash_blake2b_salt_personal@Base 0.6.0 - crypto_generichash_blake2b_saltbytes@Base 0.6.0 - crypto_generichash_blake2b_update@Base 0.6.0 - crypto_generichash_bytes@Base 0.6.0 - crypto_generichash_bytes_max@Base 0.6.0 - crypto_generichash_bytes_min@Base 0.6.0 - crypto_generichash_final@Base 0.6.0 - crypto_generichash_init@Base 0.6.0 - crypto_generichash_keybytes@Base 0.6.0 - crypto_generichash_keybytes_max@Base 0.6.0 - crypto_generichash_keybytes_min@Base 0.6.0 - crypto_generichash_primitive@Base 0.6.0 - crypto_generichash_update@Base 0.6.0 - crypto_hash@Base 0.6.0 - crypto_hash_bytes@Base 0.6.0 - crypto_hash_primitive@Base 0.6.0 - crypto_hash_sha256@Base 0.6.0 - crypto_hash_sha256_bytes@Base 0.6.0 - crypto_hash_sha256_final@Base 0.6.0 - crypto_hash_sha256_init@Base 0.6.0 - crypto_hash_sha256_update@Base 0.6.0 - crypto_hash_sha512@Base 0.6.0 - crypto_hash_sha512_bytes@Base 0.6.0 - crypto_hash_sha512_final@Base 0.6.0 - crypto_hash_sha512_init@Base 0.6.0 - crypto_hash_sha512_update@Base 0.6.0 - crypto_onetimeauth@Base 0.6.0 - crypto_onetimeauth_bytes@Base 0.6.0 - crypto_onetimeauth_final@Base 0.6.0 - crypto_onetimeauth_init@Base 0.6.0 - crypto_onetimeauth_keybytes@Base 0.6.0 - crypto_onetimeauth_pick_best_implementation@Base 0.6.0 - crypto_onetimeauth_poly1305@Base 0.6.0 - crypto_onetimeauth_poly1305_bytes@Base 0.6.0 - crypto_onetimeauth_poly1305_final@Base 0.6.0 - crypto_onetimeauth_poly1305_implementation_name@Base 0.6.0 - crypto_onetimeauth_poly1305_init@Base 0.6.0 - crypto_onetimeauth_poly1305_keybytes@Base 0.6.0 - crypto_onetimeauth_poly1305_set_implementation@Base 0.6.0 - crypto_onetimeauth_poly1305_update@Base 0.6.0 - crypto_onetimeauth_poly1305_verify@Base 0.6.0 - crypto_onetimeauth_primitive@Base 0.6.0 - crypto_onetimeauth_update@Base 0.6.0 - crypto_onetimeauth_verify@Base 0.6.0 - crypto_pwhash_scryptsalsa208sha256@Base 0.6.0 - crypto_pwhash_scryptsalsa208sha256_ll@Base 0.6.0 - crypto_pwhash_scryptsalsa208sha256_memlimit_interactive@Base 0.6.0 - crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive@Base 0.6.0 - crypto_pwhash_scryptsalsa208sha256_opslimit_interactive@Base 0.6.0 - crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive@Base 0.6.0 - crypto_pwhash_scryptsalsa208sha256_saltbytes@Base 0.6.0 - crypto_pwhash_scryptsalsa208sha256_str@Base 0.6.0 - crypto_pwhash_scryptsalsa208sha256_str_verify@Base 0.6.0 - crypto_pwhash_scryptsalsa208sha256_strbytes@Base 0.6.0 - crypto_pwhash_scryptxsalsa208sha256@Base 0.6.0 - crypto_pwhash_scryptxsalsa208sha256_saltbytes@Base 0.6.0 - crypto_pwhash_scryptxsalsa208sha256_str@Base 0.6.0 - crypto_pwhash_scryptxsalsa208sha256_str_verify@Base 0.6.0 - crypto_pwhash_scryptxsalsa208sha256_strbytes@Base 0.6.0 - crypto_scalarmult@Base 0.6.0 - crypto_scalarmult_base@Base 0.6.0 - crypto_scalarmult_bytes@Base 0.6.0 - crypto_scalarmult_curve25519@Base 0.6.0 - crypto_scalarmult_curve25519_base@Base 0.6.0 - crypto_scalarmult_curve25519_bytes@Base 0.6.0 - crypto_scalarmult_curve25519_scalarbytes@Base 0.6.0 - crypto_scalarmult_primitive@Base 0.6.0 - crypto_scalarmult_scalarbytes@Base 0.6.0 - crypto_secretbox@Base 0.6.0 - crypto_secretbox_boxzerobytes@Base 0.6.0 - crypto_secretbox_detached@Base 0.6.0 - crypto_secretbox_easy@Base 0.6.0 - crypto_secretbox_keybytes@Base 0.6.0 - crypto_secretbox_macbytes@Base 0.6.0 - crypto_secretbox_noncebytes@Base 0.6.0 - crypto_secretbox_open@Base 0.6.0 - crypto_secretbox_open_detached@Base 0.6.0 - crypto_secretbox_open_easy@Base 0.6.0 - crypto_secretbox_primitive@Base 0.6.0 - crypto_secretbox_xsalsa20poly1305@Base 0.6.0 - crypto_secretbox_xsalsa20poly1305_boxzerobytes@Base 0.6.0 - crypto_secretbox_xsalsa20poly1305_keybytes@Base 0.6.0 - crypto_secretbox_xsalsa20poly1305_macbytes@Base 0.6.0 - crypto_secretbox_xsalsa20poly1305_noncebytes@Base 0.6.0 - crypto_secretbox_xsalsa20poly1305_open@Base 0.6.0 - crypto_secretbox_xsalsa20poly1305_zerobytes@Base 0.6.0 - crypto_secretbox_zerobytes@Base 0.6.0 - crypto_shorthash@Base 0.6.0 - crypto_shorthash_bytes@Base 0.6.0 - crypto_shorthash_keybytes@Base 0.6.0 - crypto_shorthash_primitive@Base 0.6.0 - crypto_shorthash_siphash24@Base 0.6.0 - crypto_shorthash_siphash24_bytes@Base 0.6.0 - crypto_shorthash_siphash24_keybytes@Base 0.6.0 - crypto_sign@Base 0.6.0 - crypto_sign_bytes@Base 0.6.0 - crypto_sign_detached@Base 0.6.1 - crypto_sign_ed25519@Base 0.6.0 - crypto_sign_ed25519_bytes@Base 0.6.0 - crypto_sign_ed25519_detached@Base 0.6.1 - crypto_sign_ed25519_keypair@Base 0.6.0 - crypto_sign_ed25519_open@Base 0.6.0 - crypto_sign_ed25519_publickeybytes@Base 0.6.0 - crypto_sign_ed25519_secretkeybytes@Base 0.6.0 - crypto_sign_ed25519_seed_keypair@Base 0.6.0 - crypto_sign_ed25519_seedbytes@Base 0.6.0 - crypto_sign_ed25519_verify_detached@Base 0.6.1 - crypto_sign_edwards25519sha512batch@Base 0.6.0 - crypto_sign_edwards25519sha512batch_bytes@Base 0.6.0 - crypto_sign_edwards25519sha512batch_keypair@Base 0.6.0 - crypto_sign_edwards25519sha512batch_open@Base 0.6.0 - crypto_sign_edwards25519sha512batch_publickeybytes@Base 0.6.0 - crypto_sign_edwards25519sha512batch_secretkeybytes@Base 0.6.0 - crypto_sign_keypair@Base 0.6.0 - crypto_sign_open@Base 0.6.0 - crypto_sign_primitive@Base 0.6.0 - crypto_sign_publickeybytes@Base 0.6.0 - crypto_sign_secretkeybytes@Base 0.6.0 - crypto_sign_seed_keypair@Base 0.6.0 - crypto_sign_seedbytes@Base 0.6.0 - crypto_sign_verify_detached@Base 0.6.1 - crypto_stream@Base 0.6.0 - crypto_stream_aes128ctr@Base 0.6.0 - crypto_stream_aes128ctr_afternm@Base 0.6.0 - crypto_stream_aes128ctr_beforenm@Base 0.6.0 - crypto_stream_aes128ctr_beforenmbytes@Base 0.6.0 - crypto_stream_aes128ctr_keybytes@Base 0.6.0 - crypto_stream_aes128ctr_noncebytes@Base 0.6.0 - crypto_stream_aes128ctr_xor@Base 0.6.0 - crypto_stream_aes128ctr_xor_afternm@Base 0.6.0 - crypto_stream_aes256estream@Base 0.6.0 - crypto_stream_aes256estream_afternm@Base 0.6.0 - crypto_stream_aes256estream_beforenm@Base 0.6.0 - crypto_stream_aes256estream_beforenmbytes@Base 0.6.0 - crypto_stream_aes256estream_keybytes@Base 0.6.0 - crypto_stream_aes256estream_noncebytes@Base 0.6.0 - crypto_stream_aes256estream_xor@Base 0.6.0 - crypto_stream_aes256estream_xor_afternm@Base 0.6.0 - crypto_stream_chacha20@Base 0.6.0 - crypto_stream_chacha20_keybytes@Base 0.6.0 - crypto_stream_chacha20_noncebytes@Base 0.6.0 - crypto_stream_chacha20_xor@Base 0.6.0 - crypto_stream_chacha20_xor_ic@Base 0.6.0 - crypto_stream_keybytes@Base 0.6.0 - crypto_stream_noncebytes@Base 0.6.0 - crypto_stream_primitive@Base 0.6.0 - crypto_stream_salsa2012@Base 0.6.0 - crypto_stream_salsa2012_keybytes@Base 0.6.0 - crypto_stream_salsa2012_noncebytes@Base 0.6.0 - crypto_stream_salsa2012_xor@Base 0.6.0 - crypto_stream_salsa208@Base 0.6.0 - crypto_stream_salsa208_keybytes@Base 0.6.0 - crypto_stream_salsa208_noncebytes@Base 0.6.0 - crypto_stream_salsa208_xor@Base 0.6.0 - crypto_stream_salsa20@Base 0.6.0 - crypto_stream_salsa20_keybytes@Base 0.6.0 - crypto_stream_salsa20_noncebytes@Base 0.6.0 - crypto_stream_salsa20_xor@Base 0.6.0 - crypto_stream_salsa20_xor_ic@Base 0.6.0 - crypto_stream_xor@Base 0.6.0 - crypto_stream_xsalsa20@Base 0.6.0 - crypto_stream_xsalsa20_keybytes@Base 0.6.0 - crypto_stream_xsalsa20_noncebytes@Base 0.6.0 - crypto_stream_xsalsa20_xor@Base 0.6.0 - crypto_verify_16@Base 0.6.0 - crypto_verify_16_bytes@Base 0.6.0 - crypto_verify_32@Base 0.6.0 - crypto_verify_32_bytes@Base 0.6.0 - crypto_verify_64@Base 0.6.0 - crypto_verify_64_bytes@Base 0.6.0 - randombytes@Base 0.6.0 - randombytes_buf@Base 0.6.0 - randombytes_close@Base 0.6.0 - randombytes_implementation_name@Base 0.6.0 - randombytes_random@Base 0.6.0 - randombytes_salsa20_implementation@Base 0.6.0 - randombytes_salsa20_implementation_name@Base 0.6.0 - randombytes_salsa20_random@Base 0.6.0 - randombytes_salsa20_random_buf@Base 0.6.0 - randombytes_salsa20_random_close@Base 0.6.0 - randombytes_salsa20_random_stir@Base 0.6.0 - randombytes_salsa20_random_uniform@Base 0.6.0 - randombytes_set_implementation@Base 0.6.0 - randombytes_stir@Base 0.6.0 - randombytes_sysrandom@Base 0.6.0 - randombytes_sysrandom_buf@Base 0.6.0 - randombytes_sysrandom_close@Base 0.6.0 - randombytes_sysrandom_implementation@Base 0.6.0 - randombytes_sysrandom_implementation_name@Base 0.6.0 - randombytes_sysrandom_stir@Base 0.6.0 - randombytes_sysrandom_uniform@Base 0.6.0 - randombytes_uniform@Base 0.6.0 - sodium_bin2hex@Base 0.6.0 - sodium_hex2bin@Base 0.6.0 - sodium_init@Base 0.6.0 - sodium_library_version_major@Base 0.6.0 - sodium_library_version_minor@Base 0.6.0 - sodium_memcmp@Base 0.6.0 - sodium_memzero@Base 0.6.0 - sodium_mlock@Base 0.6.0 - sodium_munlock@Base 0.6.0 - sodium_runtime_get_cpu_features@Base 0.6.0 - sodium_runtime_has_neon@Base 0.6.0 - sodium_runtime_has_sse2@Base 0.6.0 - sodium_runtime_has_sse3@Base 0.6.0 - sodium_version_string@Base 0.6.0 diff --git a/debian/libsodium13.docs b/debian/libsodium13.docs new file mode 100644 index 0000000..18afe51 --- /dev/null +++ b/debian/libsodium13.docs @@ -0,0 +1,3 @@ +AUTHORS +README.markdown +THANKS diff --git a/debian/libsodium13.install b/debian/libsodium13.install new file mode 100644 index 0000000..86ca402 --- /dev/null +++ b/debian/libsodium13.install @@ -0,0 +1 @@ +/usr/lib/*/libsodium.so.* diff --git a/debian/libsodium13.symbols b/debian/libsodium13.symbols new file mode 100644 index 0000000..cd302e7 --- /dev/null +++ b/debian/libsodium13.symbols @@ -0,0 +1,305 @@ +libsodium.so.13 libsodium13 #MINVER# + (arch=amd64)_crypto_stream_salsa20@Base 0.6.0 + (arch=amd64)_crypto_stream_salsa20_xor_ic@Base 0.6.0 + crypto_aead_chacha20poly1305_abytes@Base 0.6.0 + crypto_aead_chacha20poly1305_decrypt@Base 0.6.0 + crypto_aead_chacha20poly1305_encrypt@Base 0.6.0 + crypto_aead_chacha20poly1305_keybytes@Base 0.6.0 + crypto_aead_chacha20poly1305_npubbytes@Base 0.6.0 + crypto_aead_chacha20poly1305_nsecbytes@Base 0.6.0 + crypto_auth@Base 0.6.0 + crypto_auth_bytes@Base 0.6.0 + crypto_auth_hmacsha256@Base 0.6.0 + crypto_auth_hmacsha256_bytes@Base 0.6.0 + crypto_auth_hmacsha256_final@Base 0.6.0 + crypto_auth_hmacsha256_init@Base 0.6.0 + crypto_auth_hmacsha256_keybytes@Base 0.6.0 + crypto_auth_hmacsha256_update@Base 0.6.0 + crypto_auth_hmacsha256_verify@Base 0.6.0 + crypto_auth_hmacsha512256@Base 0.6.0 + crypto_auth_hmacsha512256_bytes@Base 0.6.0 + crypto_auth_hmacsha512256_final@Base 0.6.0 + crypto_auth_hmacsha512256_init@Base 0.6.0 + crypto_auth_hmacsha512256_keybytes@Base 0.6.0 + crypto_auth_hmacsha512256_update@Base 0.6.0 + crypto_auth_hmacsha512256_verify@Base 0.6.0 + crypto_auth_hmacsha512@Base 0.6.0 + crypto_auth_hmacsha512_bytes@Base 0.6.0 + crypto_auth_hmacsha512_final@Base 0.6.0 + crypto_auth_hmacsha512_init@Base 0.6.0 + crypto_auth_hmacsha512_keybytes@Base 0.6.0 + crypto_auth_hmacsha512_update@Base 0.6.0 + crypto_auth_hmacsha512_verify@Base 0.6.0 + crypto_auth_keybytes@Base 0.6.0 + crypto_auth_primitive@Base 0.6.0 + crypto_auth_verify@Base 0.6.0 + crypto_box@Base 0.6.0 + crypto_box_afternm@Base 0.6.0 + crypto_box_beforenm@Base 0.6.0 + crypto_box_beforenmbytes@Base 0.6.0 + crypto_box_boxzerobytes@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_afternm@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_beforenm@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_beforenmbytes@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_boxzerobytes@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_keypair@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_macbytes@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_noncebytes@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_open@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_open_afternm@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_publickeybytes@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_secretkeybytes@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_seed_keypair@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_seedbytes@Base 0.6.0 + crypto_box_curve25519xsalsa20poly1305_zerobytes@Base 0.6.0 + crypto_box_detached@Base 0.6.0 + crypto_box_easy@Base 0.6.0 + crypto_box_keypair@Base 0.6.0 + crypto_box_macbytes@Base 0.6.0 + crypto_box_noncebytes@Base 0.6.0 + crypto_box_open@Base 0.6.0 + crypto_box_open_afternm@Base 0.6.0 + crypto_box_open_detached@Base 0.6.0 + crypto_box_open_easy@Base 0.6.0 + crypto_box_primitive@Base 0.6.0 + crypto_box_publickeybytes@Base 0.6.0 + crypto_box_secretkeybytes@Base 0.6.0 + crypto_box_seed_keypair@Base 0.6.0 + crypto_box_seedbytes@Base 0.6.0 + crypto_box_zerobytes@Base 0.6.0 + crypto_core_hsalsa20@Base 0.6.0 + crypto_core_hsalsa20_constbytes@Base 0.6.0 + crypto_core_hsalsa20_inputbytes@Base 0.6.0 + crypto_core_hsalsa20_keybytes@Base 0.6.0 + crypto_core_hsalsa20_outputbytes@Base 0.6.0 + crypto_core_salsa2012@Base 0.6.0 + crypto_core_salsa2012_constbytes@Base 0.6.0 + crypto_core_salsa2012_inputbytes@Base 0.6.0 + crypto_core_salsa2012_keybytes@Base 0.6.0 + crypto_core_salsa2012_outputbytes@Base 0.6.0 + crypto_core_salsa208@Base 0.6.0 + crypto_core_salsa208_constbytes@Base 0.6.0 + crypto_core_salsa208_inputbytes@Base 0.6.0 + crypto_core_salsa208_keybytes@Base 0.6.0 + crypto_core_salsa208_outputbytes@Base 0.6.0 + crypto_core_salsa20@Base 0.6.0 + crypto_core_salsa20_constbytes@Base 0.6.0 + crypto_core_salsa20_inputbytes@Base 0.6.0 + crypto_core_salsa20_keybytes@Base 0.6.0 + crypto_core_salsa20_outputbytes@Base 0.6.0 + crypto_generichash@Base 0.6.0 + crypto_generichash_blake2b@Base 0.6.0 + crypto_generichash_blake2b_bytes@Base 0.6.0 + crypto_generichash_blake2b_bytes_max@Base 0.6.0 + crypto_generichash_blake2b_bytes_min@Base 0.6.0 + crypto_generichash_blake2b_final@Base 0.6.0 + crypto_generichash_blake2b_init@Base 0.6.0 + crypto_generichash_blake2b_init_salt_personal@Base 0.6.0 + crypto_generichash_blake2b_keybytes@Base 0.6.0 + crypto_generichash_blake2b_keybytes_max@Base 0.6.0 + crypto_generichash_blake2b_keybytes_min@Base 0.6.0 + crypto_generichash_blake2b_personalbytes@Base 0.6.0 + crypto_generichash_blake2b_salt_personal@Base 0.6.0 + crypto_generichash_blake2b_saltbytes@Base 0.6.0 + crypto_generichash_blake2b_update@Base 0.6.0 + crypto_generichash_bytes@Base 0.6.0 + crypto_generichash_bytes_max@Base 0.6.0 + crypto_generichash_bytes_min@Base 0.6.0 + crypto_generichash_final@Base 0.6.0 + crypto_generichash_init@Base 0.6.0 + crypto_generichash_keybytes@Base 0.6.0 + crypto_generichash_keybytes_max@Base 0.6.0 + crypto_generichash_keybytes_min@Base 0.6.0 + crypto_generichash_primitive@Base 0.6.0 + crypto_generichash_update@Base 0.6.0 + crypto_hash@Base 0.6.0 + crypto_hash_bytes@Base 0.6.0 + crypto_hash_primitive@Base 0.6.0 + crypto_hash_sha256@Base 0.6.0 + crypto_hash_sha256_bytes@Base 0.6.0 + crypto_hash_sha256_final@Base 0.6.0 + crypto_hash_sha256_init@Base 0.6.0 + crypto_hash_sha256_update@Base 0.6.0 + crypto_hash_sha512@Base 0.6.0 + crypto_hash_sha512_bytes@Base 0.6.0 + crypto_hash_sha512_final@Base 0.6.0 + crypto_hash_sha512_init@Base 0.6.0 + crypto_hash_sha512_update@Base 0.6.0 + crypto_onetimeauth@Base 0.6.0 + crypto_onetimeauth_bytes@Base 0.6.0 + crypto_onetimeauth_final@Base 0.6.0 + crypto_onetimeauth_init@Base 0.6.0 + crypto_onetimeauth_keybytes@Base 0.6.0 + crypto_onetimeauth_poly1305@Base 0.6.0 + crypto_onetimeauth_poly1305_bytes@Base 0.6.0 + crypto_onetimeauth_poly1305_final@Base 0.6.0 + crypto_onetimeauth_poly1305_implementation_name@Base 0.6.0 + crypto_onetimeauth_poly1305_init@Base 0.6.0 + crypto_onetimeauth_poly1305_keybytes@Base 0.6.0 + crypto_onetimeauth_poly1305_set_implementation@Base 0.6.0 + crypto_onetimeauth_poly1305_update@Base 0.6.0 + crypto_onetimeauth_poly1305_verify@Base 0.6.0 + crypto_onetimeauth_primitive@Base 0.6.0 + crypto_onetimeauth_update@Base 0.6.0 + crypto_onetimeauth_verify@Base 0.6.0 + crypto_pwhash_scryptsalsa208sha256@Base 0.6.0 + crypto_pwhash_scryptsalsa208sha256_ll@Base 0.6.0 + crypto_pwhash_scryptsalsa208sha256_memlimit_interactive@Base 0.6.0 + crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive@Base 0.6.0 + crypto_pwhash_scryptsalsa208sha256_opslimit_interactive@Base 0.6.0 + crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive@Base 0.6.0 + crypto_pwhash_scryptsalsa208sha256_saltbytes@Base 0.6.0 + crypto_pwhash_scryptsalsa208sha256_str@Base 0.6.0 + crypto_pwhash_scryptsalsa208sha256_str_verify@Base 0.6.0 + crypto_pwhash_scryptsalsa208sha256_strbytes@Base 0.6.0 + crypto_pwhash_scryptsalsa208sha256_strprefix@Base 0.7.0 + crypto_scalarmult@Base 0.6.0 + crypto_scalarmult_base@Base 0.6.0 + crypto_scalarmult_bytes@Base 0.6.0 + crypto_scalarmult_curve25519@Base 0.6.0 + crypto_scalarmult_curve25519_base@Base 0.6.0 + crypto_scalarmult_curve25519_bytes@Base 0.6.0 + crypto_scalarmult_curve25519_scalarbytes@Base 0.6.0 + crypto_scalarmult_primitive@Base 0.6.0 + crypto_scalarmult_scalarbytes@Base 0.6.0 + crypto_secretbox@Base 0.6.0 + crypto_secretbox_boxzerobytes@Base 0.6.0 + crypto_secretbox_detached@Base 0.6.0 + crypto_secretbox_easy@Base 0.6.0 + crypto_secretbox_keybytes@Base 0.6.0 + crypto_secretbox_macbytes@Base 0.6.0 + crypto_secretbox_noncebytes@Base 0.6.0 + crypto_secretbox_open@Base 0.6.0 + crypto_secretbox_open_detached@Base 0.6.0 + crypto_secretbox_open_easy@Base 0.6.0 + crypto_secretbox_primitive@Base 0.6.0 + crypto_secretbox_xsalsa20poly1305@Base 0.6.0 + crypto_secretbox_xsalsa20poly1305_boxzerobytes@Base 0.6.0 + crypto_secretbox_xsalsa20poly1305_keybytes@Base 0.6.0 + crypto_secretbox_xsalsa20poly1305_macbytes@Base 0.6.0 + crypto_secretbox_xsalsa20poly1305_noncebytes@Base 0.6.0 + crypto_secretbox_xsalsa20poly1305_open@Base 0.6.0 + crypto_secretbox_xsalsa20poly1305_zerobytes@Base 0.6.0 + crypto_secretbox_zerobytes@Base 0.6.0 + crypto_shorthash@Base 0.6.0 + crypto_shorthash_bytes@Base 0.6.0 + crypto_shorthash_keybytes@Base 0.6.0 + crypto_shorthash_primitive@Base 0.6.0 + crypto_shorthash_siphash24@Base 0.6.0 + crypto_shorthash_siphash24_bytes@Base 0.6.0 + crypto_shorthash_siphash24_keybytes@Base 0.6.0 + crypto_sign@Base 0.6.0 + crypto_sign_bytes@Base 0.6.0 + crypto_sign_detached@Base 0.6.1 + crypto_sign_ed25519@Base 0.6.0 + crypto_sign_ed25519_bytes@Base 0.6.0 + crypto_sign_ed25519_detached@Base 0.6.1 + crypto_sign_ed25519_keypair@Base 0.6.0 + crypto_sign_ed25519_open@Base 0.6.0 + crypto_sign_ed25519_pk_to_curve25519@Base 0.7.0 + crypto_sign_ed25519_publickeybytes@Base 0.6.0 + crypto_sign_ed25519_secretkeybytes@Base 0.6.0 + crypto_sign_ed25519_seed_keypair@Base 0.6.0 + crypto_sign_ed25519_seedbytes@Base 0.6.0 + crypto_sign_ed25519_sk_to_curve25519@Base 0.7.0 + crypto_sign_ed25519_sk_to_pk@Base 0.7.0 + crypto_sign_ed25519_sk_to_seed@Base 0.7.0 + crypto_sign_ed25519_verify_detached@Base 0.6.1 + crypto_sign_edwards25519sha512batch@Base 0.6.0 + crypto_sign_edwards25519sha512batch_bytes@Base 0.6.0 + crypto_sign_edwards25519sha512batch_keypair@Base 0.6.0 + crypto_sign_edwards25519sha512batch_open@Base 0.6.0 + crypto_sign_edwards25519sha512batch_publickeybytes@Base 0.6.0 + crypto_sign_edwards25519sha512batch_secretkeybytes@Base 0.6.0 + crypto_sign_keypair@Base 0.6.0 + crypto_sign_open@Base 0.6.0 + crypto_sign_primitive@Base 0.6.0 + crypto_sign_publickeybytes@Base 0.6.0 + crypto_sign_secretkeybytes@Base 0.6.0 + crypto_sign_seed_keypair@Base 0.6.0 + crypto_sign_seedbytes@Base 0.6.0 + crypto_sign_verify_detached@Base 0.6.1 + crypto_stream@Base 0.6.0 + crypto_stream_aes128ctr@Base 0.6.0 + crypto_stream_aes128ctr_afternm@Base 0.6.0 + crypto_stream_aes128ctr_beforenm@Base 0.6.0 + crypto_stream_aes128ctr_beforenmbytes@Base 0.6.0 + crypto_stream_aes128ctr_keybytes@Base 0.6.0 + crypto_stream_aes128ctr_noncebytes@Base 0.6.0 + crypto_stream_aes128ctr_xor@Base 0.6.0 + crypto_stream_aes128ctr_xor_afternm@Base 0.6.0 + crypto_stream_chacha20@Base 0.6.0 + crypto_stream_chacha20_keybytes@Base 0.6.0 + crypto_stream_chacha20_noncebytes@Base 0.6.0 + crypto_stream_chacha20_xor@Base 0.6.0 + crypto_stream_chacha20_xor_ic@Base 0.6.0 + crypto_stream_keybytes@Base 0.6.0 + crypto_stream_noncebytes@Base 0.6.0 + crypto_stream_primitive@Base 0.6.0 + crypto_stream_salsa2012@Base 0.6.0 + crypto_stream_salsa2012_keybytes@Base 0.6.0 + crypto_stream_salsa2012_noncebytes@Base 0.6.0 + crypto_stream_salsa2012_xor@Base 0.6.0 + crypto_stream_salsa208@Base 0.6.0 + crypto_stream_salsa208_keybytes@Base 0.6.0 + crypto_stream_salsa208_noncebytes@Base 0.6.0 + crypto_stream_salsa208_xor@Base 0.6.0 + crypto_stream_salsa20@Base 0.6.0 + crypto_stream_salsa20_keybytes@Base 0.6.0 + crypto_stream_salsa20_noncebytes@Base 0.6.0 + crypto_stream_salsa20_xor@Base 0.6.0 + crypto_stream_salsa20_xor_ic@Base 0.6.0 + crypto_stream_xor@Base 0.6.0 + crypto_stream_xsalsa20@Base 0.6.0 + crypto_stream_xsalsa20_keybytes@Base 0.6.0 + crypto_stream_xsalsa20_noncebytes@Base 0.6.0 + crypto_stream_xsalsa20_xor@Base 0.6.0 + crypto_verify_16@Base 0.6.0 + crypto_verify_16_bytes@Base 0.6.0 + crypto_verify_32@Base 0.6.0 + crypto_verify_32_bytes@Base 0.6.0 + crypto_verify_64@Base 0.6.0 + crypto_verify_64_bytes@Base 0.6.0 + randombytes@Base 0.6.0 + randombytes_buf@Base 0.6.0 + randombytes_close@Base 0.6.0 + randombytes_implementation_name@Base 0.6.0 + randombytes_random@Base 0.6.0 + randombytes_salsa20_implementation@Base 0.6.0 + randombytes_salsa20_implementation_name@Base 0.6.0 + randombytes_salsa20_random@Base 0.6.0 + randombytes_salsa20_random_buf@Base 0.6.0 + randombytes_salsa20_random_close@Base 0.6.0 + randombytes_salsa20_random_stir@Base 0.6.0 + randombytes_salsa20_random_uniform@Base 0.6.0 + randombytes_set_implementation@Base 0.6.0 + randombytes_stir@Base 0.6.0 + randombytes_sysrandom@Base 0.6.0 + randombytes_sysrandom_buf@Base 0.6.0 + randombytes_sysrandom_close@Base 0.6.0 + randombytes_sysrandom_implementation@Base 0.6.0 + randombytes_sysrandom_implementation_name@Base 0.6.0 + randombytes_sysrandom_stir@Base 0.6.0 + randombytes_sysrandom_uniform@Base 0.6.0 + randombytes_uniform@Base 0.6.0 + sodium_allocarray@Base 0.7.0 + sodium_bin2hex@Base 0.6.0 + sodium_free@Base 0.7.0 + sodium_hex2bin@Base 0.6.0 + sodium_init@Base 0.6.0 + sodium_library_version_major@Base 0.6.0 + sodium_library_version_minor@Base 0.6.0 + sodium_malloc@Base 0.7.0 + sodium_memcmp@Base 0.6.0 + sodium_memzero@Base 0.6.0 + sodium_mlock@Base 0.6.0 + sodium_mprotect_noaccess@Base 0.7.0 + sodium_mprotect_readonly@Base 0.7.0 + sodium_mprotect_readwrite@Base 0.7.0 + sodium_munlock@Base 0.6.0 + sodium_runtime_get_cpu_features@Base 0.6.0 + sodium_runtime_has_neon@Base 0.6.0 + sodium_runtime_has_sse2@Base 0.6.0 + sodium_runtime_has_sse3@Base 0.6.0 + sodium_version_string@Base 0.6.0 diff --git a/dist-build/android-build.sh b/dist-build/android-build.sh index deb333e..ba848d7 100755 --- a/dist-build/android-build.sh +++ b/dist-build/android-build.sh @@ -31,6 +31,7 @@ $MAKE_TOOLCHAIN --platform="${NDK_PLATFORM:-android-14}" \ ./configure --host="${HOST_COMPILER}" \ --with-sysroot="${TOOLCHAIN_DIR}/sysroot" \ --prefix="${PREFIX}" \ + --enable-minimal \ --disable-soname-versions && \ make clean && \ make -j3 install && \ diff --git a/dist-build/emscripten.sh b/dist-build/emscripten.sh index bd656dc..8b0a009 100755 --- a/dist-build/emscripten.sh +++ b/dist-build/emscripten.sh @@ -1,9 +1,9 @@ #! /bin/sh export PREFIX="$(pwd)/libsodium-js" -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"]' +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"]' export TOTAL_MEMORY=33554432 -export OPTFLAGS="--llvm-lto 3 -Oz" +export OPTFLAGS="--llvm-lto 1 -Oz --emit-symbol-map" export CFLAGS="$OPTFLAGS --pre-js=test/default/pre.js " export LDFLAGS="-s EXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS} -s TOTAL_MEMORY=${TOTAL_MEMORY}" diff --git a/dist-build/ios.sh b/dist-build/ios.sh index cd8384a..3378060 100755 --- a/dist-build/ios.sh +++ b/dist-build/ios.sh @@ -10,6 +10,7 @@ export PREFIX="$(pwd)/libsodium-ios" ./configure --host=arm-apple-darwin10 \ --disable-shared \ + --enable-minimal \ --prefix="$PREFIX" && \ make clean && \ make -j3 install && \ diff --git a/libsodium.pc.in b/libsodium.pc.in index c1d4372..6a983d5 100644 --- a/libsodium.pc.in +++ b/libsodium.pc.in @@ -1,5 +1,5 @@ prefix=@prefix@ -exec_prefix=@prefix@ +exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ diff --git a/libsodium.vcxproj b/libsodium.vcxproj index 228aa0f..f6a2f85 100644 --- a/libsodium.vcxproj +++ b/libsodium.vcxproj @@ -349,7 +349,6 @@ - @@ -497,8 +496,6 @@ - - @@ -523,7 +520,6 @@ - @@ -532,4 +528,4 @@ - \ No newline at end of file + diff --git a/libsodium.vcxproj.filters b/libsodium.vcxproj.filters index ea790a3..18f0b46 100644 --- a/libsodium.vcxproj.filters +++ b/libsodium.vcxproj.filters @@ -105,9 +105,6 @@ Header Files - - Header Files - Header Files @@ -452,9 +449,6 @@ Source Files - - Source Files - Source Files @@ -479,9 +473,6 @@ Source Files - - Source Files - Source Files @@ -539,9 +530,6 @@ Source Files - - Source Files - Source Files @@ -651,4 +639,4 @@ Source Files - \ No newline at end of file + diff --git a/msvc-scripts/process.bat b/msvc-scripts/process.bat index 530f77c..2d03187 100755 --- a/msvc-scripts/process.bat +++ b/msvc-scripts/process.bat @@ -1,4 +1,4 @@ -cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/0.6.1/ < src\libsodium\include\sodium\version.h.in > tmp -cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/6/ < tmp > tmp2 -cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/1/ < tmp2 > src\libsodium\include\sodium\version.h +cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.0/ < src\libsodium\include\sodium\version.h.in > tmp +cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/7/ < tmp > tmp2 +cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/2/ < tmp2 > src\libsodium\include\sodium\version.h del tmp tmp2 diff --git a/msvc-scripts/sodium.props b/msvc-scripts/sodium.props index d68425a..613cbd0 100644 --- a/msvc-scripts/sodium.props +++ b/msvc-scripts/sodium.props @@ -6,7 +6,10 @@ $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories) - inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + UNICODE;_UNICODE;%(PreprocessorDefinitions) + NATIVE_LITTLE_ENDIAN=1;%(PreprocessorDefinitions) + inline=__inline;%(PreprocessorDefinitions) $(SolutionDir)/msvc-scripts/process.bat diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config index c986633..6e68a3b 100644 --- a/packaging/nuget/package.config +++ b/packaging/nuget/package.config @@ -1,4 +1,4 @@ - + diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec index 36ee748..f836a8a 100644 --- a/packaging/nuget/package.nuspec +++ b/packaging/nuget/package.nuspec @@ -7,7 +7,7 @@ libsodium_vc120 - 0.6.0.1 + 0.7.0.0 libsodium_vc120 libsodium contributors Eric Voskuil @@ -40,52 +40,52 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - libsodium-x86-v120-mt-s-0_6_0_1.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-s-0_7_0_0.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-sgd-0_6_0_1.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-sgd-0_7_0_0.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-s-0_6_0_1.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-s-0_7_0_0.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-sgd-0_6_0_1.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-sgd-0_7_0_0.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-s-0_6_0_1.ltcg.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-s-0_7_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-sgd-0_6_0_1.ltcg.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-sgd-0_7_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-s-0_6_0_1.ltcg.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-s-0_7_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-sgd-0_6_0_1.ltcg.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-sgd-0_7_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-0_6_0_1.imp.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-0_7_0_0.imp.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-gd-0_6_0_1.imp.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-gd-0_7_0_0.imp.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-0_6_0_1.imp.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-0_7_0_0.imp.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-gd-0_6_0_1.imp.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-gd-0_7_0_0.imp.lib;%(AdditionalDependencies) @@ -98,26 +98,26 @@ - - + + - - + + - - + + - - + +