Move fipstools/ to util/fipstools/cavp

We have two “fipstools” directories, which is silly. Unify them into one
by moving CAVP stuff into a subdirectory of util/fipstools.

Change-Id: Ibeaa2205c58699f3d042445bfa6a6576a762da6f
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/36624
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>

CMakeLists.txt

@@ -557,8 +557,8 @@ add_library(crypto_test_data OBJECT crypto_test_data.cc)
 add_subdirectory(crypto)
 add_subdirectory(ssl)
 add_subdirectory(ssl/test)
-add_subdirectory(fipstools)
 add_subdirectory(tool)
+add_subdirectory(util/fipstools/cavp)
 add_subdirectory(decrepit)
 
 if(FUZZ)

crypto/fipsmodule/FIPS.md

@@ -13,9 +13,9 @@ BoringCrypto has undergone the following validations:
 
 ## Running CAVP tests
 
-CAVP results are calculated by `fipstools/cavp`, but that binary is almost always run by `fipstools/run_cavp.go`. The latter knows the set of tests to be processed and the flags needed to configure `cavp` for each one. It must be run from the top of a CAVP directory and needs the following options:
+CAVP results are calculated by `util/fipstools/cavp`, but that binary is almost always run by `util/fipstools/run_cavp.go`. The latter knows the set of tests to be processed and the flags needed to configure `cavp` for each one. It must be run from the top of a CAVP directory and needs the following options:
 
-1. `-oracle-bin`: points to the location of `fipstools/cavp`
+1. `-oracle-bin`: points to the location of `util/fipstools/cavp`
 2. `-no-fax`: this is needed to suppress checking of the FAX files, which are only included in sample sets.
 
 ## Breaking power-on and continuous tests

util/fipstools/break-tests.sh

@@ -40,7 +40,7 @@ fi
 for test in $TESTS; do
 	pushd build-$test
 	printf "\n\n\\x1b[1m$test\\x1b[0m\n"
-	./fipstools/test_fips
+	./util/fipstools/test_fips
 	echo "Waiting for keypress..."
 	read
 	popd
@@ -48,6 +48,6 @@ done
 
 pushd build-NONE
 printf "\\x1b[1mIntegrity\\x1b[0m\n"
-go run ../util/fipstools/break-hash.go ./fipstools/test_fips ./fipstools/test_fips_broken
-./fipstools/test_fips_broken
+go run ../util/fipstools/break-hash.go ./util/fipstools/test_fips ./util/fipstools/test_fips_broken
+./util/fipstools/test_fips_broken
 popd

util/fipstools/cavp/CMakeLists.txt

@@ -1,4 +1,4 @@
-include_directories(../include)
+include_directories(../../../include)
 
 if(FIPS)
   add_executable(