Skip to content

Commit

Permalink
SHA-256 is used on AArch64, even if NO_ASM.
Browse files Browse the repository at this point in the history
Change-Id: I6cc25dd27e8a6a82821aa370a34fb115c5987f1a
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48246
Reviewed-by: David Benjamin <davidben@google.com>
  • Loading branch information
Adam Langley authored and agl committed Jun 25, 2021
1 parent b90cddd commit 25d501c
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions crypto/fipsmodule/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,15 @@ if(FIPS_DELOCATE)
set_target_properties(bcm_hashunset PROPERTIES LINKER_LANGUAGE C)

set(MAYBE_INJECT_HASH_SHA256_FLAG "")
if (ARCH STREQUAL "aarch64")
# If building with OPENSSL_NO_ASM then ARCH will be "generic", but we still
# need to use SHA-256. Since this only matters for FIPS, we only need to
# worry about the Linux spelling of AArch64.
if (ARCH STREQUAL "aarch64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
set(MAYBE_INJECT_HASH_SHA256_FLAG "-sha256")
endif()

go_executable(inject_hash
boringssl.googlesource.com/boringssl/util/fipstools/inject_hash)
boringssl.googlesource.com/boringssl/util/fipstools/inject_hash)
add_custom_command(
OUTPUT bcm.o
COMMAND ./inject_hash -o bcm.o -in-archive $<TARGET_FILE:bcm_hashunset> ${MAYBE_INJECT_HASH_SHA256_FLAG}
Expand Down

0 comments on commit 25d501c

Please sign in to comment.