Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to 1.0.19, removed headers #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 28 additions & 37 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ option(SODIUM_MINIMAL "Only compile the minimum set of functions required for th
option(SODIUM_ENABLE_BLOCKING_RANDOM "Enable this switch only if /dev/urandom is totally broken on the target platform" OFF)

add_library(${PROJECT_NAME}
libsodium/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c
libsodium/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c
libsodium/src/libsodium/crypto_aead/aegis128l/aead_aegis128l.c
libsodium/src/libsodium/crypto_aead/aegis128l/aegis128l_soft.c
libsodium/src/libsodium/crypto_aead/aegis256/aead_aegis256.c
libsodium/src/libsodium/crypto_aead/aegis256/aegis256_soft.c
libsodium/src/libsodium/crypto_aead/aes256gcm/aead_aes256gcm.c
libsodium/src/libsodium/crypto_aead/chacha20poly1305/aead_chacha20poly1305.c
libsodium/src/libsodium/crypto_aead/xchacha20poly1305/aead_xchacha20poly1305.c
libsodium/src/libsodium/crypto_auth/crypto_auth.c
libsodium/src/libsodium/crypto_auth/hmacsha256/auth_hmacsha256.c
libsodium/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512.c
Expand All @@ -24,73 +28,61 @@ add_library(${PROJECT_NAME}
libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c
libsodium/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c
libsodium/src/libsodium/crypto_core/hsalsa20/core_hsalsa20.c
libsodium/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c
libsodium/src/libsodium/crypto_core/hsalsa20/core_hsalsa20.c
libsodium/src/libsodium/crypto_core/salsa/ref/core_salsa_ref.c
libsodium/src/libsodium/crypto_core/softaes/softaes.c
libsodium/src/libsodium/crypto_generichash/crypto_generichash.c
libsodium/src/libsodium/crypto_generichash/blake2b/generichash_blake2.c
libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c
libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ref.c
libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c
libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c
libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-ref.c
libsodium/src/libsodium/crypto_generichash/blake2b/ref/generichash_blake2b.c
libsodium/src/libsodium/crypto_generichash/crypto_generichash.c
libsodium/src/libsodium/crypto_hash/crypto_hash.c
libsodium/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c
libsodium/src/libsodium/crypto_hash/sha256/hash_sha256.c
libsodium/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c
libsodium/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c
libsodium/src/libsodium/crypto_hash/sha512/hash_sha512.c
libsodium/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c
libsodium/src/libsodium/crypto_kdf/blake2b/kdf_blake2b.c
libsodium/src/libsodium/crypto_kdf/crypto_kdf.c
libsodium/src/libsodium/crypto_kdf/hkdf/kdf_hkdf_sha256.c
libsodium/src/libsodium/crypto_kdf/hkdf/kdf_hkdf_sha512.c
libsodium/src/libsodium/crypto_kx/crypto_kx.c
libsodium/src/libsodium/crypto_onetimeauth/crypto_onetimeauth.c
libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c
libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c
libsodium/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c
libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c
libsodium/src/libsodium/crypto_pwhash/argon2/argon2-core.c
libsodium/src/libsodium/crypto_pwhash/argon2/argon2-encoding.c
libsodium/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-avx2.c
libsodium/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-avx512f.c
libsodium/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c
libsodium/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c
libsodium/src/libsodium/crypto_pwhash/argon2/argon2.c
libsodium/src/libsodium/crypto_pwhash/argon2/blake2b-long.c
libsodium/src/libsodium/crypto_pwhash/argon2/pwhash_argon2i.c
libsodium/src/libsodium/crypto_pwhash/argon2/pwhash_argon2id.c
libsodium/src/libsodium/crypto_pwhash/crypto_pwhash.c
libsodium/src/libsodium/crypto_scalarmult/crypto_scalarmult.c
libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c
libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_invert.c
libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe_frombytes_sandy2x.c
libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c
libsodium/src/libsodium/crypto_secretbox/crypto_secretbox.c
libsodium/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c
libsodium/src/libsodium/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c
libsodium/src/libsodium/crypto_secretstream/xchacha20poly1305/secretstream_xchacha20poly1305.c
libsodium/src/libsodium/crypto_shorthash/crypto_shorthash.c
libsodium/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c
libsodium/src/libsodium/crypto_shorthash/siphash24/shorthash_siphash24.c
libsodium/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c
libsodium/src/libsodium/crypto_sign/crypto_sign.c
libsodium/src/libsodium/crypto_sign/ed25519/sign_ed25519.c
libsodium/src/libsodium/crypto_sign/ed25519/ref10/keypair.c
libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c
libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c
libsodium/src/libsodium/crypto_sign/ed25519/sign_ed25519.c
libsodium/src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-avx2.c
libsodium/src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-ssse3.c
libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c
libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c
libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c
libsodium/src/libsodium/crypto_stream/crypto_stream.c
libsodium/src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.c
libsodium/src/libsodium/crypto_stream/salsa20/stream_salsa20.c
libsodium/src/libsodium/crypto_stream/salsa20/xmm6/salsa20_xmm6.c
libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-avx2.c
libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-sse2.c
libsodium/src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.c
libsodium/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20.c
libsodium/src/libsodium/crypto_verify/sodium/verify.c
libsodium/src/libsodium/randombytes/internal/randombytes_internal_random.c
libsodium/src/libsodium/crypto_verify/verify.c
libsodium/src/libsodium/randombytes/randombytes.c
libsodium/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c
libsodium/src/libsodium/randombytes/internal/randombytes_internal_random.c
libsodium/src/libsodium/sodium/codecs.c
libsodium/src/libsodium/sodium/core.c
libsodium/src/libsodium/sodium/runtime.c
Expand All @@ -106,17 +98,15 @@ if(NOT SODIUM_MINIMAL)
libsodium/src/libsodium/crypto_core/ed25519/core_ed25519.c
libsodium/src/libsodium/crypto_core/ed25519/core_ristretto255.c
libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c
libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c
libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c
libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c
libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c
libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c
libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c
libsodium/src/libsodium/crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c
libsodium/src/libsodium/crypto_scalarmult/ristretto255/ref10/scalarmult_ristretto255_ref10.c
libsodium/src/libsodium/crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c
libsodium/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c
libsodium/src/libsodium/crypto_shorthash/siphash24/shorthash_siphashx24.c
libsodium/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c
libsodium/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c
libsodium/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012_ref.c
libsodium/src/libsodium/crypto_stream/salsa2012/stream_salsa2012.c
libsodium/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208_ref.c
Expand Down Expand Up @@ -147,12 +137,13 @@ target_compile_definitions(${PROJECT_NAME}
$<$<BOOL:${SODIUM_ENABLE_BLOCKING_RANDOM}>:USE_BLOCKING_RANDOM>
$<$<BOOL:${SODIUM_MINIMAL}>:MINIMAL>
$<$<C_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
$<$<C_COMPILER_ID:MSVC>:>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was committed by mistake, i'll be sure to remove this in the final working commit

)

# Variables that need to be exported to version.h.in
set(VERSION 1.0.18)
set(SODIUM_LIBRARY_VERSION_MAJOR 10)
set(SODIUM_LIBRARY_VERSION_MINOR 3)
set(VERSION 1.0.19)
set(SODIUM_LIBRARY_VERSION_MAJOR 26)
set(SODIUM_LIBRARY_VERSION_MINOR 1)
if(SODIUM_MINIMAL)
set(SODIUM_LIBRARY_MINIMAL_DEF "#define SODIUM_LIBRARY_MINIMAL 1")
endif()
Expand Down
2 changes: 1 addition & 1 deletion libsodium
Submodule libsodium updated 288 files
16 changes: 12 additions & 4 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ function(make_test name)
)
endfunction()

make_test(aead_aegis128l
${PROJECT_SOURCE_DIR}/libsodium/test/default/aead_aegis128l.c
)

make_test(aead_aegis256
${PROJECT_SOURCE_DIR}/libsodium/test/default/aead_aegis256.c
)

make_test(test_aead_aes256gcm
${PROJECT_SOURCE_DIR}/libsodium/test/default/aead_aes256gcm.c
)
Expand Down Expand Up @@ -249,10 +257,6 @@ make_test(test_secretbox_easy2
${PROJECT_SOURCE_DIR}/libsodium/test/default/secretbox_easy2.c
)

make_test(test_secretstream
${PROJECT_SOURCE_DIR}/libsodium/test/default/secretstream.c
)

make_test(test_shorthash
${PROJECT_SOURCE_DIR}/libsodium/test/default/shorthash.c
)
Expand Down Expand Up @@ -310,6 +314,10 @@ if(NOT SODIUM_MINIMAL)
${PROJECT_SOURCE_DIR}/libsodium/test/default/core_ristretto255.c
)

make_test(test_kdf_hkdf
${PROJECT_SOURCE_DIR}/libsodium/test/default/kdf_hkdf.c
)

make_test(test_pwhash_scrypt
${PROJECT_SOURCE_DIR}/libsodium/test/default/pwhash_scrypt.c
)
Expand Down
Loading