commit 391cc8c7a16d3a6efd8fb0e9fe3a22218e994e54
author David Benjamin <davidben@google.com> Fri Apr 14 15:41:55 2017 -0400
committer Adam Langley <agl@google.com> Fri May 12 15:08:46 2017 +0000
tree 18535d7df6fb9785e959ad6596f407d7dd09519e
parent 583c12ea974de502c99f336e6f8f20cfbffe471e

Move FIPS build tools to util/fipstools.

This makes things a little easier for some of our tooling.

Change-Id: Ia7e73daf0a5150b106cf9b03b10cae194cb8fc5a
Reviewed-on: https://boringssl-review.googlesource.com/15104
Reviewed-by: Matt Braithwaite <mab@google.com>
Reviewed-by: Adam Langley <agl@google.com>

crypto/fipsmodule/CMakeLists.txt

diff --git a/crypto/fipsmodule/CMakeLists.txt b/crypto/fipsmodule/CMakeLists.txt
index 46e623a..4bcaf47 100644
--- a/crypto/fipsmodule/CMakeLists.txt
+++ b/crypto/fipsmodule/CMakeLists.txt
@@ -148,8 +148,8 @@
 
   add_custom_command(
     OUTPUT bcm-delocated.S
-    COMMAND ${GO_EXECUTABLE} run crypto/fipsmodule/delocate.go crypto/fipsmodule/ar.go crypto/fipsmodule/const.go -a $<TARGET_FILE:bcm_c_generated_asm> -o ${CMAKE_CURRENT_BINARY_DIR}/bcm-delocated.S ${DELOCATE_ASM_ARGS}
-    DEPENDS bcm_c_generated_asm ${BCM_ASM_SOURCES} delocate.go ar.go const.go
+    COMMAND ${GO_EXECUTABLE} run util/fipstools/delocate.go util/fipstools/ar.go util/fipstools/const.go -a $<TARGET_FILE:bcm_c_generated_asm> -o ${CMAKE_CURRENT_BINARY_DIR}/bcm-delocated.S ${DELOCATE_ASM_ARGS}
+    DEPENDS bcm_c_generated_asm ${BCM_ASM_SOURCES} ${CMAKE_SOURCE_DIR}/util/fipstools/delocate.go ${CMAKE_SOURCE_DIR}/util/fipstools/ar.go ${CMAKE_SOURCE_DIR}/util/fipstools/const.go
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
   )
 
@@ -166,8 +166,8 @@
 
   add_custom_command(
     OUTPUT bcm.o
-    COMMAND ${GO_EXECUTABLE} run crypto/fipsmodule/inject-hash.go crypto/fipsmodule/ar.go crypto/fipsmodule/const.go -o ${CMAKE_CURRENT_BINARY_DIR}/bcm.o -in-archive $<TARGET_FILE:bcm_hashunset>
-    DEPENDS bcm_hashunset inject-hash.go ar.go const.go
+    COMMAND ${GO_EXECUTABLE} run util/fipstools/inject-hash.go util/fipstools/ar.go util/fipstools/const.go -o ${CMAKE_CURRENT_BINARY_DIR}/bcm.o -in-archive $<TARGET_FILE:bcm_hashunset>
+    DEPENDS bcm_hashunset ${CMAKE_SOURCE_DIR}/util/fipstools/inject-hash.go ${CMAKE_SOURCE_DIR}/util/fipstools/ar.go ${CMAKE_SOURCE_DIR}/util/fipstools/const.go
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
   )
 

util/fipstools/ar.go

diff --git a/crypto/fipsmodule/ar.go b/util/fipstools/ar.go
similarity index 100%
rename from crypto/fipsmodule/ar.go
rename to util/fipstools/ar.go

util/fipstools/const.go

diff --git a/crypto/fipsmodule/const.go b/util/fipstools/const.go
similarity index 100%
rename from crypto/fipsmodule/const.go
rename to util/fipstools/const.go

util/fipstools/delocate.go

diff --git a/crypto/fipsmodule/delocate.go b/util/fipstools/delocate.go
similarity index 100%
rename from crypto/fipsmodule/delocate.go
rename to util/fipstools/delocate.go

util/fipstools/inject-hash.go

diff --git a/crypto/fipsmodule/inject-hash.go b/util/fipstools/inject-hash.go
similarity index 100%
rename from crypto/fipsmodule/inject-hash.go
rename to util/fipstools/inject-hash.go