From 530fb132526f8f166347a1b6a8a64a1b74f1d0a7 Mon Sep 17 00:00:00 2001 From: Justin Smith Date: Wed, 19 Feb 2025 10:23:08 -0500 Subject: [PATCH] Use AWSLC_SOURCE_DIR not PROJECT_SOURCE_DIR --- CMakeLists.txt | 26 ++++++++--------- crypto/CMakeLists.txt | 36 ++++++++++++------------ crypto/fipsmodule/CMakeLists.txt | 32 ++++++++++----------- ssl/CMakeLists.txt | 2 +- third_party/jitterentropy/CMakeLists.txt | 14 ++++----- tool-openssl/CMakeLists.txt | 2 +- tool/CMakeLists.txt | 2 +- 7 files changed, 57 insertions(+), 57 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fcb8c928e3..77a183f4e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1053,7 +1053,7 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(HANDSHAKER_ARGS "-handshaker-path" $) - set(SSL_TRANSFER_ARGS "-ssl-transfer-test-file" ${PROJECT_SOURCE_DIR}/ssl/test/runner/ssl_transfer/test_case_names.txt) + set(SSL_TRANSFER_ARGS "-ssl-transfer-test-file" ${AWSLC_SOURCE_DIR}/ssl/test/runner/ssl_transfer/test_case_names.txt) if(DEFINED ENV{AWS_LC_SSL_RUNNER_START_INDEX}) set(AWS_LC_SSL_RUNNER_INDEX_FILTER "-test-case-start-index" $ENV{AWS_LC_SSL_RUNNER_START_INDEX}) endif() @@ -1103,7 +1103,7 @@ if(BUILD_TESTING) # us hash anywhere from 1-8 gigabytes of memory, so running multiple at the same time cause a # failure on most machines due to a lack of memory. set(acvp_sha_test_commands) - file(GLOB acvp_sha_tests "${PROJECT_SOURCE_DIR}/util/fipstools/acvp/acvptool/test/sha-tests/*.json") + file(GLOB acvp_sha_tests "${AWSLC_SOURCE_DIR}/util/fipstools/acvp/acvptool/test/sha-tests/*.json") foreach(test_path ${acvp_sha_tests}) get_filename_component(test_name ${test_path} NAME) list(APPEND acvp_sha_test_commands @@ -1119,7 +1119,7 @@ if(BUILD_TESTING) boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool COMMAND ${GO_EXECUTABLE} build -o ${TEST_WRAPPER} boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool/testmodulewrapper - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR} DEPENDS modulewrapper ${MAYBE_USES_TERMINAL}) @@ -1132,7 +1132,7 @@ if(BUILD_TESTING) -module-wrappers modulewrapper:$,testmodulewrapper:${TEST_WRAPPER} -tests tests.json ${acvp_sha_test_commands} - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/util/fipstools/acvp/acvptool/test + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR}/util/fipstools/acvp/acvptool/test DEPENDS build_acvp_tool ${MAYBE_USES_TERMINAL}) @@ -1172,7 +1172,7 @@ if(BUILD_TESTING) COMMAND cd ssl/test/runner && ${GO_EXECUTABLE} test -timeout ${GO_TEST_TIMEOUT} -shim-path $ ${HANDSHAKER_ARGS} ${RUNNER_ARGS} ${AWS_LC_SSL_RUNNER_INDEX_FILTER} ${SSL_TRANSFER_ARGS} - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR} DEPENDS bssl_shim handshaker fips_specific_tests_if_any ${MAYBE_USES_TERMINAL}) @@ -1182,7 +1182,7 @@ if(BUILD_TESTING) COMMAND cd ssl/test/runner && ${GO_EXECUTABLE} test -timeout ${GO_TEST_TIMEOUT} -shim-path $ -valgrind ${HANDSHAKER_ARGS} ${RUNNER_ARGS} ${AWS_LC_SSL_RUNNER_INDEX_FILTER} ${SSL_TRANSFER_ARGS} - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR} DEPENDS bssl_shim handshaker fips_specific_tests_if_any ${MAYBE_USES_TERMINAL}) @@ -1195,7 +1195,7 @@ if(BUILD_TESTING) COMMAND ${CMAKE_COMMAND} -E echo "Running unit tests" COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir ${PROJECT_BINARY_DIR} - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR} DEPENDS all_tests run_ssl_runner_tests ${MAYBE_USES_TERMINAL}) else() @@ -1207,7 +1207,7 @@ if(BUILD_TESTING) COMMAND ${CMAKE_COMMAND} -E echo "Running unit tests" COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir ${PROJECT_BINARY_DIR} -ssl-tests=false - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR} DEPENDS all_tests fips_specific_tests_if_any ${MAYBE_USES_TERMINAL} ) @@ -1217,7 +1217,7 @@ if(BUILD_TESTING) run_tests_valgrind COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir ${PROJECT_BINARY_DIR} -valgrind=true -valgrind-supp-dir="tests/ci" - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR} DEPENDS all_tests ${MAYBE_USES_TERMINAL}) @@ -1225,7 +1225,7 @@ if(BUILD_TESTING) run_tests_with_sde COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir ${PROJECT_BINARY_DIR} -sde=true -sde-path="$ENV{SDEROOT}/sde" - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR} DEPENDS all_tests ${MAYBE_USES_TERMINAL}) else() @@ -1235,7 +1235,7 @@ if(BUILD_TESTING) COMMAND crypto_test COMMAND urandom_test COMMAND ssl_test - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR} DEPENDS all_tests ${MAYBE_USES_TERMINAL}) else() @@ -1243,7 +1243,7 @@ if(BUILD_TESTING) run_minimal_tests COMMAND crypto_test COMMAND urandom_test - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR} DEPENDS all_tests ${MAYBE_USES_TERMINAL} ) @@ -1283,7 +1283,7 @@ join_paths(libdir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") join_paths(includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") foreach(in_file ${OPENSSL_PKGCONFIGS}) - file(RELATIVE_PATH in_file ${PROJECT_SOURCE_DIR} ${in_file}) + file(RELATIVE_PATH in_file ${AWSLC_SOURCE_DIR} ${in_file}) string(REPLACE ".in" "" pc_file ${in_file}) configure_file(${in_file} ${CMAKE_CURRENT_BINARY_DIR}/${pc_file} @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pc_file} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index eb5259a78d..4903688473 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -26,7 +26,7 @@ function(msbuild_aarch64_asm) --target=arm64-pc-windows-msvc /c /I "${PROJECT_BINARY_DIR}/symbol_prefix_include/" - /I "${PROJECT_SOURCE_DIR}/include" + /I "${AWSLC_SOURCE_DIR}/include" /o "${OBJ_FILE}" "${ASM_FILE}" DEPENDS ${ASM_FILE} @@ -152,13 +152,13 @@ if(PERL_EXECUTABLE) COMMAND ${PERL_COMMAND} DEPENDS ${src} - ${PROJECT_SOURCE_DIR}/crypto/perlasm/arm-xlate.pl - ${PROJECT_SOURCE_DIR}/crypto/perlasm/ppc-xlate.pl - ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86_64-xlate.pl - ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86asm.pl - ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86gas.pl - ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86masm.pl - ${PROJECT_SOURCE_DIR}/crypto/perlasm/x86nasm.pl + ${AWSLC_SOURCE_DIR}/crypto/perlasm/arm-xlate.pl + ${AWSLC_SOURCE_DIR}/crypto/perlasm/ppc-xlate.pl + ${AWSLC_SOURCE_DIR}/crypto/perlasm/x86_64-xlate.pl + ${AWSLC_SOURCE_DIR}/crypto/perlasm/x86asm.pl + ${AWSLC_SOURCE_DIR}/crypto/perlasm/x86gas.pl + ${AWSLC_SOURCE_DIR}/crypto/perlasm/x86masm.pl + ${AWSLC_SOURCE_DIR}/crypto/perlasm/x86nasm.pl WORKING_DIRECTORY . ) endfunction() @@ -583,7 +583,7 @@ target_compile_definitions(crypto_objects PRIVATE BORINGSSL_IMPLEMENTATION) # For the prefix build, the object files need the prefix header files to build. add_dependencies(crypto_objects boringssl_prefix_symbols) target_include_directories(crypto_objects BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include) -target_include_directories(crypto_objects PRIVATE ${PROJECT_SOURCE_DIR}/include) +target_include_directories(crypto_objects PRIVATE ${AWSLC_SOURCE_DIR}/include) function(build_libcrypto name module_source) if(FIPS AND ENABLE_FIPS_ENTROPY_CPU_JITTER) @@ -608,7 +608,7 @@ function(build_libcrypto name module_source) target_include_directories(${name} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include) target_include_directories(${name} PUBLIC - $ + $ $) endfunction() @@ -621,14 +621,14 @@ if(FIPS_SHARED) build_libcrypto(precrypto $) add_executable(fips_empty_main fipsmodule/fips_empty_main.c) target_link_libraries(fips_empty_main PUBLIC precrypto) - target_include_directories(fips_empty_main PRIVATE ${PROJECT_SOURCE_DIR}/include) + target_include_directories(fips_empty_main PRIVATE ${AWSLC_SOURCE_DIR}/include) target_include_directories(fips_empty_main BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include) add_custom_command(OUTPUT generated_fips_shared_support.c COMMAND ${GO_EXECUTABLE} run - ${PROJECT_SOURCE_DIR}/util/fipstools/capture_hash/capture_hash.go + ${AWSLC_SOURCE_DIR}/util/fipstools/capture_hash/capture_hash.go -in-executable $ > generated_fips_shared_support.c WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS fips_empty_main ${PROJECT_SOURCE_DIR}/util/fipstools/capture_hash/capture_hash.go + DEPENDS fips_empty_main ${AWSLC_SOURCE_DIR}/util/fipstools/capture_hash/capture_hash.go ) add_library( generated_fipsmodule @@ -636,10 +636,10 @@ if(FIPS_SHARED) OBJECT generated_fips_shared_support.c - ${PROJECT_SOURCE_DIR}/crypto/fipsmodule/cpucap/cpucap.c + ${AWSLC_SOURCE_DIR}/crypto/fipsmodule/cpucap/cpucap.c ) add_dependencies(generated_fipsmodule boringssl_prefix_symbols) - target_include_directories(generated_fipsmodule PRIVATE ${PROJECT_SOURCE_DIR}/include) + target_include_directories(generated_fipsmodule PRIVATE ${AWSLC_SOURCE_DIR}/include) target_include_directories(generated_fipsmodule BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include) build_libcrypto(crypto $) @@ -654,9 +654,9 @@ if(FIPS_SHARED) add_custom_command( TARGET crypto POST_BUILD COMMAND ${GO_EXECUTABLE} run - ${PROJECT_SOURCE_DIR}/util/fipstools/inject_hash/inject_hash.go + ${AWSLC_SOURCE_DIR}/util/fipstools/inject_hash/inject_hash.go -o $ -in-object $ ${INJECT_HASH_APPLE_FLAG} - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR} ) # On macOS 11 and higher on Apple Silicon, codesigning is mandatory for @@ -678,7 +678,7 @@ if(FIPS_SHARED) add_custom_command( TARGET crypto POST_BUILD COMMAND codesign -s - $ - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + WORKING_DIRECTORY ${AWSLC_SOURCE_DIR} ) endif() diff --git a/crypto/fipsmodule/CMakeLists.txt b/crypto/fipsmodule/CMakeLists.txt index 29c798cd64..eb71313248 100644 --- a/crypto/fipsmodule/CMakeLists.txt +++ b/crypto/fipsmodule/CMakeLists.txt @@ -193,12 +193,12 @@ if((((ARCH STREQUAL "x86_64") AND NOT MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX) OR # Set the source directory for s2n-bignum assembly files if(ARCH STREQUAL "x86_64") - set(S2N_BIGNUM_DIR ${PROJECT_SOURCE_DIR}/third_party/s2n-bignum/x86_att) + set(S2N_BIGNUM_DIR ${AWSLC_SOURCE_DIR}/third_party/s2n-bignum/x86_att) else() - set(S2N_BIGNUM_DIR ${PROJECT_SOURCE_DIR}/third_party/s2n-bignum/arm) + set(S2N_BIGNUM_DIR ${AWSLC_SOURCE_DIR}/third_party/s2n-bignum/arm) endif() - set(S2N_BIGNUM_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/third_party/s2n-bignum/include) + set(S2N_BIGNUM_INCLUDE_DIR ${AWSLC_SOURCE_DIR}/third_party/s2n-bignum/include) # We add s2n-bignum files to a separate list because they need # to go through C preprocessor in case of the static build. @@ -365,7 +365,7 @@ if(FIPS_DELOCATE) add_dependencies(bcm_c_generated_asm boringssl_prefix_symbols) # Important: We do not want to add the generated prefix symbols to the include path here! # Delocator expects symbols to not be prefixed. - target_include_directories(bcm_c_generated_asm PRIVATE ${PROJECT_SOURCE_DIR}/include) + target_include_directories(bcm_c_generated_asm PRIVATE ${AWSLC_SOURCE_DIR}/include) set_target_properties(bcm_c_generated_asm PROPERTIES COMPILE_OPTIONS "-S") set_target_properties(bcm_c_generated_asm PROPERTIES POSITION_INDEPENDENT_CODE ON) @@ -392,17 +392,17 @@ if(FIPS_DELOCATE) -cc ${CMAKE_ASM_COMPILER} -cc-flags "${TARGET} ${CMAKE_ASM_FLAGS}" ${DELOCATE_EXTRA_ARGS} - ${PROJECT_SOURCE_DIR}/include/openssl/arm_arch.h - ${PROJECT_SOURCE_DIR}/include/openssl/asm_base.h - ${PROJECT_SOURCE_DIR}/include/openssl/target.h + ${AWSLC_SOURCE_DIR}/include/openssl/arm_arch.h + ${AWSLC_SOURCE_DIR}/include/openssl/asm_base.h + ${AWSLC_SOURCE_DIR}/include/openssl/target.h ${BCM_ASM_SOURCES} DEPENDS bcm_c_generated_asm delocate ${BCM_ASM_SOURCES} - ${PROJECT_SOURCE_DIR}/include/openssl/arm_arch.h - ${PROJECT_SOURCE_DIR}/include/openssl/asm_base.h - ${PROJECT_SOURCE_DIR}/include/openssl/target.h + ${AWSLC_SOURCE_DIR}/include/openssl/arm_arch.h + ${AWSLC_SOURCE_DIR}/include/openssl/asm_base.h + ${AWSLC_SOURCE_DIR}/include/openssl/target.h WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) @@ -425,7 +425,7 @@ if(FIPS_DELOCATE) add_dependencies(bcm_hashunset boringssl_prefix_symbols) target_include_directories(bcm_hashunset BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include) - target_include_directories(bcm_hashunset PRIVATE ${PROJECT_SOURCE_DIR}/include) + target_include_directories(bcm_hashunset PRIVATE ${AWSLC_SOURCE_DIR}/include) set_target_properties(bcm_hashunset PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(bcm_hashunset PROPERTIES LINKER_LANGUAGE C) @@ -457,7 +457,7 @@ if(FIPS_DELOCATE) add_dependencies(fipsmodule boringssl_prefix_symbols) target_include_directories(fipsmodule BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include) - target_include_directories(fipsmodule PRIVATE ${PROJECT_SOURCE_DIR}/include) + target_include_directories(fipsmodule PRIVATE ${AWSLC_SOURCE_DIR}/include) set_target_properties(fipsmodule PROPERTIES LINKER_LANGUAGE C) elseif(FIPS_SHARED) @@ -477,7 +477,7 @@ elseif(FIPS_SHARED) add_dependencies(fipsmodule boringssl_prefix_symbols) target_include_directories(fipsmodule BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include) - target_include_directories(fipsmodule PRIVATE ${PROJECT_SOURCE_DIR}/include) + target_include_directories(fipsmodule PRIVATE ${AWSLC_SOURCE_DIR}/include) add_library( bcm_library @@ -489,11 +489,11 @@ elseif(FIPS_SHARED) ${BCM_ASM_SOURCES} ) target_compile_definitions(bcm_library PRIVATE BORINGSSL_IMPLEMENTATION) - target_include_directories(bcm_library PRIVATE ${PROJECT_SOURCE_DIR}/include) + target_include_directories(bcm_library PRIVATE ${AWSLC_SOURCE_DIR}/include) add_dependencies(bcm_library boringssl_prefix_symbols) target_include_directories(bcm_library BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include) - target_include_directories(bcm_library PRIVATE ${PROJECT_SOURCE_DIR}/include) + target_include_directories(bcm_library PRIVATE ${AWSLC_SOURCE_DIR}/include) if (APPLE) set(BCM_NAME bcm.o) # The linker on macOS doesn't have the ability to process linker scripts, @@ -601,6 +601,6 @@ else() add_dependencies(fipsmodule boringssl_prefix_symbols) target_include_directories(fipsmodule BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include) - target_include_directories(fipsmodule PRIVATE ${PROJECT_SOURCE_DIR}/include) + target_include_directories(fipsmodule PRIVATE ${AWSLC_SOURCE_DIR}/include) endif() diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index 6dc2d4b044..889b31c96f 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -50,7 +50,7 @@ target_link_libraries(ssl crypto) target_include_directories(ssl BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include) target_include_directories(ssl PUBLIC - $ + $ $) if(BUILD_TESTING) diff --git a/third_party/jitterentropy/CMakeLists.txt b/third_party/jitterentropy/CMakeLists.txt index a74eebd80b..1839bff527 100644 --- a/third_party/jitterentropy/CMakeLists.txt +++ b/third_party/jitterentropy/CMakeLists.txt @@ -7,14 +7,14 @@ # the same as the source code. set(JITTER_SOURCES - ${PROJECT_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-base.c - ${PROJECT_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-gcd.c - ${PROJECT_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-health.c - ${PROJECT_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-noise.c - ${PROJECT_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-sha3.c - ${PROJECT_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-timer.c) + ${AWSLC_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-base.c + ${AWSLC_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-gcd.c + ${AWSLC_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-health.c + ${AWSLC_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-noise.c + ${AWSLC_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-sha3.c + ${AWSLC_SOURCE_DIR}/third_party/jitterentropy/jitterentropy-timer.c) -include_directories(${PROJECT_SOURCE_DIR}/include) +include_directories(${AWSLC_SOURCE_DIR}/include) if(MSVC) set(JITTER_COMPILE_FLAGS "/Od /W4 /DYNAMICBASE /DAWSLC") diff --git a/tool-openssl/CMakeLists.txt b/tool-openssl/CMakeLists.txt index bad9f88874..7f2cc35274 100644 --- a/tool-openssl/CMakeLists.txt +++ b/tool-openssl/CMakeLists.txt @@ -17,7 +17,7 @@ add_executable( x509.cc ) -target_include_directories(openssl PUBLIC ${PROJECT_SOURCE_DIR}/include) +target_include_directories(openssl PUBLIC ${AWSLC_SOURCE_DIR}/include) target_compile_options(openssl PUBLIC -DINTERNAL_TOOL) if(WIN32) diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt index 547bf6b710..df50f40a0b 100644 --- a/tool/CMakeLists.txt +++ b/tool/CMakeLists.txt @@ -20,7 +20,7 @@ add_executable( transport_common.cc ) -target_include_directories(bssl PUBLIC ${PROJECT_SOURCE_DIR}/include) +target_include_directories(bssl PUBLIC ${AWSLC_SOURCE_DIR}/include) target_compile_options(bssl PUBLIC -DINTERNAL_TOOL) if(WIN32)