From 420fb406efc0ed945e8ef38c39e1d288d10c8e2f Mon Sep 17 00:00:00 2001 From: m-obi Date: Fri, 14 Feb 2025 14:00:52 +0100 Subject: [PATCH] Update to 1.0.20-RELEASE --- CMakeLists.txt | 28 ++++++++++++++++++++-------- libsodium | 2 +- test/CMakeLists.txt | 16 ++++++++++++++-- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7c8bed..d368571 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,18 @@ 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/aegis128l/aead_aegis128l.c + libsodium/src/libsodium/crypto_aead/aegis128l/aegis128l_aesni.c + libsodium/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.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_aesni.c + libsodium/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c + libsodium/src/libsodium/crypto_aead/aegis256/aegis256_soft.c 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/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 @@ -35,6 +44,7 @@ add_library(${PROJECT_NAME} 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/salsa/ref/core_salsa_ref.c + libsodium/src/libsodium/crypto_core/softaes/softaes.c libsodium/src/libsodium/crypto_generichash/blake2b/generichash_blake2.c libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2.h libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c @@ -57,6 +67,8 @@ add_library(${PROJECT_NAME} libsodium/src/libsodium/crypto_hash/sha512/hash_sha512.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 @@ -98,8 +110,6 @@ add_library(${PROJECT_NAME} libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_namespace.h libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe_frombytes_sandy2x.c libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.h - libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.h - libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base_namespace.h libsodium/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_namespace.h libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.h @@ -145,9 +155,11 @@ add_library(${PROJECT_NAME} libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/u4.h libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/u8.h libsodium/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20.c - libsodium/src/libsodium/crypto_verify/sodium/verify.c + libsodium/src/libsodium/crypto_verify/verify.c libsodium/src/libsodium/include/sodium.h libsodium/src/libsodium/include/sodium/core.h + libsodium/src/libsodium/include/sodium/crypto_aead_aegis128l.h + libsodium/src/libsodium/include/sodium/crypto_aead_aegis256.h libsodium/src/libsodium/include/sodium/crypto_aead_aes256gcm.h libsodium/src/libsodium/include/sodium/crypto_aead_chacha20poly1305.h libsodium/src/libsodium/include/sodium/crypto_aead_xchacha20poly1305.h @@ -281,9 +293,9 @@ target_compile_definitions(${PROJECT_NAME} ) # 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.20) +set(SODIUM_LIBRARY_VERSION_MAJOR 26) +set(SODIUM_LIBRARY_VERSION_MINOR 2) if(SODIUM_MINIMAL) set(SODIUM_LIBRARY_MINIMAL_DEF "#define SODIUM_LIBRARY_MINIMAL 1") endif() diff --git a/libsodium b/libsodium index 4f5e89f..9511c98 160000 --- a/libsodium +++ b/libsodium @@ -1 +1 @@ -Subproject commit 4f5e89fa84ce1d178a6765b8b46f2b6f91216677 +Subproject commit 9511c982fb1d046470a8b42aa36556cdb7da15de diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5542118..1d62961 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -25,6 +25,14 @@ function(make_test name) ) endfunction() +make_test(test_aead_aegis128l + ${PROJECT_SOURCE_DIR}/libsodium/test/default/aead_aegis128l.c +) + +make_test(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 ) @@ -161,6 +169,10 @@ make_test(test_kdf ${PROJECT_SOURCE_DIR}/libsodium/test/default/kdf.c ) +make_test(test_kdf_hkdf + ${PROJECT_SOURCE_DIR}/libsodium/test/default/kdf_hkdf.c +) + make_test(test_keygen ${PROJECT_SOURCE_DIR}/libsodium/test/default/keygen.c ) @@ -249,8 +261,8 @@ 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_secretstream_xchacha20poly1305 + ${PROJECT_SOURCE_DIR}/libsodium/test/default/secretstream_xchacha20poly1305.c ) make_test(test_shorthash