Skip to content

Commit

Permalink
clean code and adjust comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Bill Yang committed Jul 25, 2024
1 parent b0ee741 commit f6080ff
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion crypto/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ if(GO_EXECUTABLE)
else()
file(COPY ${GENERATE_CODE_ROOT}/err_data.c DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
endif()

# We need to create a object library off of the generated err_data.c in so we can mark it as a dependency for our C inject hash implementation
if(FIPS)
add_library(generated_err_data OBJECT err_data.c)
target_include_directories(generated_err_data PRIVATE ${PROJECT_SOURCE_DIR}/include)
Expand Down Expand Up @@ -659,7 +661,7 @@ if(FIPS_SHARED)
# the hash directly into the final library.
build_libcrypto(crypto $<TARGET_OBJECTS:fipsmodule>)
if (APPLE)
# Add subdirectory that handles building a non-FIPS library to use in inject_hash
# Add subdirectory that handles building a stripped-down version of AWS-LC for use in calculating and injecting the FIPS integrity hash
add_subdirectory(fips_hashing)
add_subdirectory(${PROJECT_SOURCE_DIR}/util/fipstools/inject_hash inject_hash)

Expand Down
2 changes: 1 addition & 1 deletion crypto/fips_hashing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ if(FIPS AND APPLE)

SET_TARGET_PROPERTIES(fips_hashing PROPERTIES LINKER_LANGUAGE C)
target_include_directories(fips_hashing PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
endif()
endif()

0 comments on commit f6080ff

Please sign in to comment.