fipsoracle: Combine all test oracles into a single binary.
Change-Id: If53f88135976e5f8f113c0e68bd880e378c98fd9
Reviewed-on: https://boringssl-review.googlesource.com/15885
Reviewed-by: Martin Kreichgauer <martinkr@google.com>
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/fipsoracle/cavp_aes_test.cc b/fipsoracle/cavp_aes_test.cc
index c341e85..d116759 100644
--- a/fipsoracle/cavp_aes_test.cc
+++ b/fipsoracle/cavp_aes_test.cc
@@ -26,6 +26,8 @@
#include "cavp_test_util.h"
+namespace {
+
struct TestCtx {
const EVP_CIPHER *cipher;
std::unique_ptr<FileTest> response_sample;
@@ -37,6 +39,8 @@
Mode mode;
};
+}
+
static bool MonteCarlo(const TestCtx *ctx, FileTest *t,
const EVP_CIPHER *cipher, std::vector<uint8_t> *out,
bool encrypt, std::vector<uint8_t> key,
@@ -231,9 +235,7 @@
return 1;
}
-int main(int argc, char **argv) {
- CRYPTO_library_init();
-
+int cavp_aes_test_main(int argc, char **argv) {
if (argc < 4 || argc > 5) {
return usage(argv[0]);
}