Move crypto/fipsoracle/ to the top-level.
This works better with util/generate_build_files.py.
Change-Id: Icb55dc74e0a004aca3e09978640455b66f0473ff
Reviewed-on: https://boringssl-review.googlesource.com/15648
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65a55a1..9b7ff79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,6 +268,7 @@
add_subdirectory(crypto)
add_subdirectory(ssl)
add_subdirectory(ssl/test)
+add_subdirectory(fipsoracle)
add_subdirectory(tool)
add_subdirectory(decrepit)
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 1548b76..5996577 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -122,7 +122,6 @@
add_subdirectory(test)
add_subdirectory(fipsmodule)
-add_subdirectory(fipsoracle)
add_library(
crypto_base
diff --git a/crypto/fipsoracle/CMakeLists.txt b/fipsoracle/CMakeLists.txt
similarity index 96%
rename from crypto/fipsoracle/CMakeLists.txt
rename to fipsoracle/CMakeLists.txt
index 4aa5699..04634ac 100644
--- a/crypto/fipsoracle/CMakeLists.txt
+++ b/fipsoracle/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(../../include)
+include_directories(../include)
if (FIPS)
add_executable(
diff --git a/crypto/fipsoracle/cavp_aes_gcm_test.cc b/fipsoracle/cavp_aes_gcm_test.cc
similarity index 99%
rename from crypto/fipsoracle/cavp_aes_gcm_test.cc
rename to fipsoracle/cavp_aes_gcm_test.cc
index 171a4e7..9871b73 100644
--- a/crypto/fipsoracle/cavp_aes_gcm_test.cc
+++ b/fipsoracle/cavp_aes_gcm_test.cc
@@ -23,7 +23,7 @@
#include <openssl/crypto.h>
#include <openssl/err.h>
-#include "../test/file_test.h"
+#include "../crypto/test/file_test.h"
#include "cavp_test_util.h"
diff --git a/crypto/fipsoracle/cavp_aes_test.cc b/fipsoracle/cavp_aes_test.cc
similarity index 99%
rename from crypto/fipsoracle/cavp_aes_test.cc
rename to fipsoracle/cavp_aes_test.cc
index 21e49fb..c341e85 100644
--- a/crypto/fipsoracle/cavp_aes_test.cc
+++ b/fipsoracle/cavp_aes_test.cc
@@ -22,7 +22,7 @@
#include <openssl/crypto.h>
#include <openssl/err.h>
-#include "../test/file_test.h"
+#include "../crypto/test/file_test.h"
#include "cavp_test_util.h"
diff --git a/crypto/fipsoracle/cavp_ecdsa2_pkv_test.cc b/fipsoracle/cavp_ecdsa2_pkv_test.cc
similarity index 97%
rename from crypto/fipsoracle/cavp_ecdsa2_pkv_test.cc
rename to fipsoracle/cavp_ecdsa2_pkv_test.cc
index 25117b4..74c9da1 100644
--- a/crypto/fipsoracle/cavp_ecdsa2_pkv_test.cc
+++ b/fipsoracle/cavp_ecdsa2_pkv_test.cc
@@ -24,7 +24,7 @@
#include <openssl/err.h>
#include <openssl/nid.h>
-#include "../test/file_test.h"
+#include "../crypto/test/file_test.h"
#include "cavp_test_util.h"
diff --git a/crypto/fipsoracle/cavp_ecdsa2_sigver_test.cc b/fipsoracle/cavp_ecdsa2_sigver_test.cc
similarity index 98%
rename from crypto/fipsoracle/cavp_ecdsa2_sigver_test.cc
rename to fipsoracle/cavp_ecdsa2_sigver_test.cc
index e18016a..9401854 100644
--- a/crypto/fipsoracle/cavp_ecdsa2_sigver_test.cc
+++ b/fipsoracle/cavp_ecdsa2_sigver_test.cc
@@ -26,7 +26,7 @@
#include <openssl/err.h>
#include <openssl/nid.h>
-#include "../test/file_test.h"
+#include "../crypto/test/file_test.h"
#include "cavp_test_util.h"
diff --git a/crypto/fipsoracle/cavp_sha_monte_test.cc b/fipsoracle/cavp_sha_monte_test.cc
similarity index 98%
rename from crypto/fipsoracle/cavp_sha_monte_test.cc
rename to fipsoracle/cavp_sha_monte_test.cc
index 33a348f..47b885e 100644
--- a/crypto/fipsoracle/cavp_sha_monte_test.cc
+++ b/fipsoracle/cavp_sha_monte_test.cc
@@ -21,7 +21,7 @@
#include <openssl/crypto.h>
#include <openssl/digest.h>
-#include "../test/file_test.h"
+#include "../crypto/test/file_test.h"
#include "cavp_test_util.h"
diff --git a/crypto/fipsoracle/cavp_sha_test.cc b/fipsoracle/cavp_sha_test.cc
similarity index 98%
rename from crypto/fipsoracle/cavp_sha_test.cc
rename to fipsoracle/cavp_sha_test.cc
index 2131728..ca60bb0 100644
--- a/crypto/fipsoracle/cavp_sha_test.cc
+++ b/fipsoracle/cavp_sha_test.cc
@@ -21,7 +21,7 @@
#include <openssl/crypto.h>
#include <openssl/digest.h>
-#include "../test/file_test.h"
+#include "../crypto/test/file_test.h"
#include "cavp_test_util.h"
diff --git a/crypto/fipsoracle/cavp_test_util.cc b/fipsoracle/cavp_test_util.cc
similarity index 100%
rename from crypto/fipsoracle/cavp_test_util.cc
rename to fipsoracle/cavp_test_util.cc
diff --git a/crypto/fipsoracle/cavp_test_util.h b/fipsoracle/cavp_test_util.h
similarity index 97%
rename from crypto/fipsoracle/cavp_test_util.h
rename to fipsoracle/cavp_test_util.h
index 1402eff..44bb496 100644
--- a/crypto/fipsoracle/cavp_test_util.h
+++ b/fipsoracle/cavp_test_util.h
@@ -22,7 +22,7 @@
#include <openssl/aead.h>
#include <openssl/cipher.h>
-#include "../test/file_test.h"
+#include "../crypto/test/file_test.h"
std::string EncodeHex(const uint8_t *in, size_t in_len);
diff --git a/crypto/fipsoracle/run_cavp.go b/fipsoracle/run_cavp.go
similarity index 100%
rename from crypto/fipsoracle/run_cavp.go
rename to fipsoracle/run_cavp.go
