From e456244fdbe1d9b0c04ac8735896dd624c0ebf9e Mon Sep 17 00:00:00 2001 From: CPunch Date: Sun, 31 Dec 2023 02:42:03 -0600 Subject: [PATCH] stripped headers as #5 suggested; added non-minimal sources --- CMakeLists.txt | 65 +++++++++++++++++--------------------------------- 1 file changed, 22 insertions(+), 43 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a1a6c4d..10edccd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,15 +12,9 @@ option(SODIUM_ENABLE_BLOCKING_RANDOM "Enable this switch only if /dev/urandom is add_library(${PROJECT_NAME} libsodium/src/libsodium/crypto_aead/aegis128l/aead_aegis128l.c - libsodium/src/libsodium/crypto_aead/aegis128l/aegis128l_common.h libsodium/src/libsodium/crypto_aead/aegis128l/aegis128l_soft.c - libsodium/src/libsodium/crypto_aead/aegis128l/aegis128l_soft.h - libsodium/src/libsodium/crypto_aead/aegis128l/implementations.h libsodium/src/libsodium/crypto_aead/aegis256/aead_aegis256.c - libsodium/src/libsodium/crypto_aead/aegis256/aegis256_common.h libsodium/src/libsodium/crypto_aead/aegis256/aegis256_soft.c - libsodium/src/libsodium/crypto_aead/aegis256/aegis256_soft.h - libsodium/src/libsodium/crypto_aead/aegis256/implementations.h 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 @@ -33,7 +27,6 @@ add_library(${PROJECT_NAME} libsodium/src/libsodium/crypto_box/crypto_box_seal.c libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c libsodium/src/libsodium/crypto_core/ed25519/core_h2c.c - libsodium/src/libsodium/crypto_core/ed25519/core_h2c.h 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/ref2/core_hsalsa20_ref2.c @@ -42,11 +35,7 @@ add_library(${PROJECT_NAME} 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/blake2.h libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ref.c - libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-load-sse2.h - libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-load-sse41.h - libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-load-avx2.h libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-ref.c libsodium/src/libsodium/crypto_generichash/blake2b/ref/generichash_blake2b.c libsodium/src/libsodium/crypto_hash/crypto_hash.c @@ -61,29 +50,18 @@ add_library(${PROJECT_NAME} libsodium/src/libsodium/crypto_kx/crypto_kx.c libsodium/src/libsodium/crypto_onetimeauth/crypto_onetimeauth.c libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c - libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.h - libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.h - libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h - libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h 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-core.h libsodium/src/libsodium/crypto_pwhash/argon2/argon2-encoding.c - libsodium/src/libsodium/crypto_pwhash/argon2/argon2-encoding.h libsodium/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c libsodium/src/libsodium/crypto_pwhash/argon2/argon2.c - libsodium/src/libsodium/crypto_pwhash/argon2/argon2.h libsodium/src/libsodium/crypto_pwhash/argon2/blake2b-long.c - libsodium/src/libsodium/crypto_pwhash/argon2/blake2b-long.h - libsodium/src/libsodium/crypto_pwhash/argon2/blamka-round-ref.h 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/ref10/x25519_ref10.h libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c - libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.h 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 @@ -91,31 +69,17 @@ add_library(${PROJECT_NAME} libsodium/src/libsodium/crypto_shorthash/crypto_shorthash.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_shorthash/siphash24/ref/shorthash_siphash_ref.h 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/ref10/sign_ed25519_ref10.h libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c - libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.h - libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.h libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c libsodium/src/libsodium/crypto_stream/crypto_stream.c libsodium/src/libsodium/crypto_stream/salsa20/stream_salsa20.c - libsodium/src/libsodium/crypto_stream/salsa20/stream_salsa20.h libsodium/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20.c libsodium/src/libsodium/crypto_verify/verify.c - libsodium/src/libsodium/include/sodium/private/asm_cet.h - libsodium/src/libsodium/include/sodium/private/chacha20_ietf_ext.h - libsodium/src/libsodium/include/sodium/private/common.h - libsodium/src/libsodium/include/sodium/private/ed25519_ref10.h - libsodium/src/libsodium/include/sodium/private/implementations.h - libsodium/src/libsodium/include/sodium/private/mutex.h - libsodium/src/libsodium/include/sodium/private/sse2_64_32.h - libsodium/src/libsodium/include/sodium/private/softaes.h - libsodium/src/libsodium/include/sodium/private/quirks.h libsodium/src/libsodium/randombytes/randombytes.c libsodium/src/libsodium/sodium/codecs.c libsodium/src/libsodium/sodium/core.c @@ -125,13 +89,28 @@ add_library(${PROJECT_NAME} ) if(NOT SODIUM_MINIMAL) - # target_sources(${PROJECT_NAME} - # PRIVATE - # libsodium/src/libsodium/crypto_stream/salsa20/xmm6/salsa20_xmm6-asm_namespace.h - # libsodium/src/libsodium/crypto_stream/salsa20/xmm6/salsa20_xmm6.c - # libsodium/src/libsodium/crypto_stream/salsa20/xmm6/salsa20_xmm6.h - # libsodium/src/libsodium/crypto_stream/xchacha20/stream_xchacha20.c - # ) + target_sources(${PROJECT_NAME} + PRIVATE + libsodium/src/libsodium/crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c + libsodium/src/libsodium/crypto_box/curve25519xchacha20poly1305/box_seal_curve25519xchacha20poly1305.c + 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/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/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/shorthash_siphashx24.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 + libsodium/src/libsodium/crypto_stream/salsa208/stream_salsa208.c + libsodium/src/libsodium/crypto_stream/xchacha20/stream_xchacha20.c + ) endif() set_target_properties(${PROJECT_NAME}