Skip to content
This repository has been archived by the owner on Sep 4, 2022. It is now read-only.

Update libsodium submodule to latest stable branch commit. #420

Merged
merged 2 commits into from
Jul 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions libsodium-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -312,18 +312,18 @@ fn is_release_profile() -> bool {
#[cfg(all(target_env = "msvc", target_pointer_width = "32"))]
fn get_lib_dir() -> PathBuf {
if is_release_profile() {
get_crate_dir().join("msvc/Win32/Release/v140/")
get_crate_dir().join("msvc/Win32/Release/v142/")
} else {
get_crate_dir().join("msvc/Win32/Debug/v140/")
get_crate_dir().join("msvc/Win32/Debug/v142/")
}
}

#[cfg(all(target_env = "msvc", target_pointer_width = "64"))]
fn get_lib_dir() -> PathBuf {
if is_release_profile() {
get_crate_dir().join("msvc/x64/Release/v140/")
get_crate_dir().join("msvc/x64/Release/v142/")
} else {
get_crate_dir().join("msvc/x64/Debug/v140/")
get_crate_dir().join("msvc/x64/Debug/v142/")
}
}

Expand Down
2 changes: 1 addition & 1 deletion libsodium-sys/libsodium
Submodule libsodium updated 95 files
+34 −0 .github/workflows/codeql-analysis.yml
+164 −0 .github/workflows/dotnet-core.yml
+1 −1 LICENSE
+22 −17 Makefile.in
+2 −1 README.markdown
+27 −25 aclocal.m4
+72 −10 autogen.sh
+3 −20 azure-pipelines.yml
+3 −3 build-aux/compile
+24 −5 build-aux/config.guess
+319 −264 build-aux/config.sub
+1 −1 build-aux/depcomp
+12 −1 build-aux/install-sh
+1 −1 build-aux/missing
+1 −1 build-aux/test-driver
+2 −2 builds/Makefile.in
+0 −2 builds/msvc/vs2010/libsodium/libsodium.vcxproj
+0 −6 builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
+0 −2 builds/msvc/vs2012/libsodium/libsodium.vcxproj
+0 −6 builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
+0 −2 builds/msvc/vs2013/libsodium/libsodium.vcxproj
+0 −6 builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
+0 −2 builds/msvc/vs2015/libsodium/libsodium.vcxproj
+0 −6 builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
+0 −2 builds/msvc/vs2017/libsodium/libsodium.vcxproj
+0 −6 builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters
+0 −2 builds/msvc/vs2019/libsodium/libsodium.vcxproj
+0 −6 builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters
+1,203 −1,196 configure
+13 −10 configure.ac
+2 −2 contrib/Makefile.in
+2 −2 dist-build/Makefile.in
+1 −1 dist-build/android-build.sh
+2 −1 dist-build/emscripten.sh
+2 −2 dist-build/ios.sh
+2 −2 lgtm.yml
+0 −2 libsodium.vcxproj
+0 −6 libsodium.vcxproj.filters
+2 −2 msvc-scripts/Makefile.in
+0 −5 packaging/dotnet-core/.gitignore
+0 −59 packaging/dotnet-core/README.md
+12 −7 packaging/dotnet-core/libsodium.pkgproj
+0 −302 packaging/dotnet-core/prepare.py
+0 −3 packaging/dotnet-core/recipes/alpine-x64
+0 −9 packaging/dotnet-core/recipes/build
+0 −3 packaging/dotnet-core/recipes/centos-x64
+0 −4 packaging/dotnet-core/recipes/debian-x64
+0 −3 packaging/dotnet-core/recipes/fedora-x64
+0 −4 packaging/dotnet-core/recipes/linux-x64
+0 −3 packaging/dotnet-core/recipes/opensuse-x64
+0 −5 packaging/dotnet-core/recipes/pack
+0 −27 packaging/dotnet-core/recipes/test
+0 −4 packaging/dotnet-core/recipes/ubuntu-x64
+43 −0 packaging/dotnet-core/test.cs
+2 −2 src/Makefile.in
+1 −4 src/libsodium/Makefile.am
+3 −8 src/libsodium/Makefile.in
+1 −1 src/libsodium/crypto_box/crypto_box_seal.c
+1 −1 src/libsodium/crypto_box/curve25519xchacha20poly1305/box_seal_curve25519xchacha20poly1305.c
+2 −2 src/libsodium/crypto_core/ed25519/core_ed25519.c
+105 −107 src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
+11 −10 src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c
+17 −19 src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c
+1 −1 src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
+1 −46 src/libsodium/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c
+0 −1,295 src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S
+0 −18 src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.h
+0 −8 src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base_namespace.h
+0 −1 src/libsodium/crypto_scalarmult/curve25519/sandy2x/sandy2x.S
+2 −1 src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c
+2 −2 src/libsodium/crypto_secretbox/crypto_secretbox_easy.c
+2 −2 src/libsodium/crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c
+0 −31 src/libsodium/crypto_stream/chacha20/dolbeau/u8.h
+2 −2 src/libsodium/include/Makefile.in
+1 −1 src/libsodium/include/sodium/crypto_kdf_blake2b.h
+1 −1 src/libsodium/include/sodium/private/ed25519_ref10_fe_25_5.h
+1 −1 src/libsodium/include/sodium/private/ed25519_ref10_fe_51.h
+15 −2 src/libsodium/sodium/utils.c
+2 −2 test/Makefile.in
+2 −2 test/default/Makefile.in
+66 −2 test/default/box_seal.c
+1 −1 test/default/chacha20.c
+22 −22 test/default/chacha20.exp
+128 −0 test/default/core_ed25519.c
+22 −0 test/default/core_ed25519.exp
+1 −0 test/default/core_ristretto255.c
+6 −0 test/default/scalarmult.c
+1 −0 test/default/scalarmult.exp
+5 −14 test/default/scalarmult2.c
+1 −4 test/default/scalarmult2.exp
+6 −15 test/default/scalarmult5.c
+1 −4 test/default/scalarmult5.exp
+3 −1 test/default/sodium_utils2.c
+3 −1 test/default/sodium_utils3.c
+19 −7 test/default/wasi-test-wrapper.sh
Binary file modified libsodium-sys/mingw/win32/libsodium.a
Binary file not shown.
Binary file modified libsodium-sys/mingw/win64/libsodium.a
Binary file not shown.
Binary file removed libsodium-sys/msvc/Win32/Debug/v140/libsodium.lib
Binary file not shown.
Binary file added libsodium-sys/msvc/Win32/Debug/v142/libsodium.lib
Binary file not shown.
Binary file removed libsodium-sys/msvc/Win32/Release/v140/libsodium.lib
Binary file not shown.
Binary file not shown.
Binary file removed libsodium-sys/msvc/x64/Debug/v140/libsodium.lib
Binary file not shown.
Binary file added libsodium-sys/msvc/x64/Debug/v142/libsodium.lib
Binary file not shown.
Binary file removed libsodium-sys/msvc/x64/Release/v140/libsodium.lib
Binary file not shown.
Binary file added libsodium-sys/msvc/x64/Release/v142/libsodium.lib
Binary file not shown.