Rename inject-hash: Bazel does not like hyphens. (Only in package names. Hyphens in file names are file.) Change-Id: I80b705a780ffbad056abe7a7868d5682b30d2d44 Reviewed-on: https://boringssl-review.googlesource.com/32144 Commit-Queue: Matt Braithwaite <mab@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Reviewed-by: David Benjamin <davidben@google.com>
diff --git a/crypto/fipsmodule/CMakeLists.txt b/crypto/fipsmodule/CMakeLists.txt index 9868dd8..e6c8cc6 100644 --- a/crypto/fipsmodule/CMakeLists.txt +++ b/crypto/fipsmodule/CMakeLists.txt
@@ -162,12 +162,12 @@ set_target_properties(bcm_hashunset PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(bcm_hashunset PROPERTIES LINKER_LANGUAGE C) - go_executable(inject-hash - boringssl.googlesource.com/boringssl/util/fipstools/inject-hash) + go_executable(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> - DEPENDS bcm_hashunset inject-hash + COMMAND ./inject_hash -o bcm.o -in-archive $<TARGET_FILE:bcm_hashunset> + DEPENDS bcm_hashunset inject_hash WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
diff --git a/crypto/fipsmodule/FIPS.md b/crypto/fipsmodule/FIPS.md index a691d18..426b38e 100644 --- a/crypto/fipsmodule/FIPS.md +++ b/crypto/fipsmodule/FIPS.md
@@ -103,7 +103,7 @@ In order to actually implement the integrity test, a constructor function within the module calculates an HMAC from `module_start` to `module_end` using a fixed, all-zero key. It compares the result with the known-good value added (by the script) to the unhashed portion of the text segment. If they don't match, it calls `exit` in an infinite loop. -Initially the known-good value will be incorrect. Another script (`inject-hash.go`) calculates the correct value from the assembled object and injects it back into the object. +Initially the known-good value will be incorrect. Another script (`inject_hash.go`) calculates the correct value from the assembled object and injects it back into the object. 
diff --git a/util/fipstools/inject-hash/inject-hash.go b/util/fipstools/inject_hash/inject_hash.go similarity index 98% rename from util/fipstools/inject-hash/inject-hash.go rename to util/fipstools/inject_hash/inject_hash.go index d079654..29307c0 100644 --- a/util/fipstools/inject-hash/inject-hash.go +++ b/util/fipstools/inject_hash/inject_hash.go
@@ -12,7 +12,7 @@ // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -// inject-hash parses an archive containing a file object file. It finds a FIPS +// inject_hash parses an archive containing a file object file. It finds a FIPS // module inside that object, calculates its hash and replaces the default hash // value in the object with the calculated value. package main