Revert "VBoot Reference: Refactor Part 2 - Crypto Libraries"
This reverts commit e018a80a37aaa45681f45f5852f04d20aedd8b2d.
Review URL: http://codereview.chromium.org/1593002
diff --git a/tests/big_firmware_tests.c b/tests/big_firmware_tests.c
index 44328ea..2368b47 100644
--- a/tests/big_firmware_tests.c
+++ b/tests/big_firmware_tests.c
@@ -9,9 +9,9 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
#include "file_keys.h"
#include "firmware_image.h"
+#include "rsa_utility.h"
#include "test_common.h"
#include "utility.h"
diff --git a/tests/big_kernel_tests.c b/tests/big_kernel_tests.c
index c78f622..7fc5fb3 100644
--- a/tests/big_kernel_tests.c
+++ b/tests/big_kernel_tests.c
@@ -9,9 +9,9 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
#include "file_keys.h"
#include "kernel_image.h"
+#include "rsa_utility.h"
#include "test_common.h"
#include "utility.h"
diff --git a/tests/firmware_image_tests.c b/tests/firmware_image_tests.c
index a2ce472..fd19560 100644
--- a/tests/firmware_image_tests.c
+++ b/tests/firmware_image_tests.c
@@ -8,9 +8,9 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
#include "file_keys.h"
#include "firmware_image.h"
+#include "rsa_utility.h"
#include "test_common.h"
#include "utility.h"
diff --git a/tests/firmware_rollback_tests.c b/tests/firmware_rollback_tests.c
index 3608db7..9973ec7 100644
--- a/tests/firmware_rollback_tests.c
+++ b/tests/firmware_rollback_tests.c
@@ -8,9 +8,9 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
#include "file_keys.h"
#include "firmware_image.h"
+#include "rsa_utility.h"
#include "utility.h"
#include "rollback_index.h"
#include "test_common.h"
diff --git a/tests/firmware_splicing_tests.c b/tests/firmware_splicing_tests.c
index c3259b7..c71b8b4 100644
--- a/tests/firmware_splicing_tests.c
+++ b/tests/firmware_splicing_tests.c
@@ -8,9 +8,10 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
#include "file_keys.h"
#include "firmware_image.h"
+#include "padding.h"
+#include "rsa_utility.h"
#include "test_common.h"
#include "utility.h"
diff --git a/tests/firmware_verify_benchmark.c b/tests/firmware_verify_benchmark.c
index 3d06dc9..8eafc70 100644
--- a/tests/firmware_verify_benchmark.c
+++ b/tests/firmware_verify_benchmark.c
@@ -8,9 +8,10 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
#include "file_keys.h"
#include "firmware_image.h"
+#include "padding.h"
+#include "rsa_utility.h"
#include "test_common.h"
#include "timer_utils.h"
#include "utility.h"
diff --git a/tests/kernel_image_tests.c b/tests/kernel_image_tests.c
index eee0417..c8f8035 100644
--- a/tests/kernel_image_tests.c
+++ b/tests/kernel_image_tests.c
@@ -8,9 +8,9 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
#include "file_keys.h"
#include "kernel_image.h"
+#include "rsa_utility.h"
#include "test_common.h"
#include "utility.h"
diff --git a/tests/kernel_rollback_tests.c b/tests/kernel_rollback_tests.c
index 08f874c..eafbaaa 100644
--- a/tests/kernel_rollback_tests.c
+++ b/tests/kernel_rollback_tests.c
@@ -8,9 +8,9 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
#include "file_keys.h"
#include "kernel_image.h"
+#include "rsa_utility.h"
#include "rollback_index.h"
#include "test_common.h"
#include "utility.h"
diff --git a/tests/kernel_splicing_tests.c b/tests/kernel_splicing_tests.c
index d4c9bb5..da29eb1 100644
--- a/tests/kernel_splicing_tests.c
+++ b/tests/kernel_splicing_tests.c
@@ -8,9 +8,10 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
#include "file_keys.h"
#include "kernel_image.h"
+#include "padding.h"
+#include "rsa_utility.h"
#include "test_common.h"
#include "utility.h"
diff --git a/tests/kernel_verify_benchmark.c b/tests/kernel_verify_benchmark.c
index 369785c..c3259fc 100644
--- a/tests/kernel_verify_benchmark.c
+++ b/tests/kernel_verify_benchmark.c
@@ -8,9 +8,10 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
#include "file_keys.h"
#include "kernel_image.h"
+#include "padding.h"
+#include "rsa_utility.h"
#include "test_common.h"
#include "timer_utils.h"
#include "utility.h"
diff --git a/tests/rollback_index_mock.c b/tests/rollback_index_mock.c
index 37dde48..6317214 100644
--- a/tests/rollback_index_mock.c
+++ b/tests/rollback_index_mock.c
@@ -7,8 +7,8 @@
#include "rollback_index.h"
-#include <stdint.h>
#include <stdio.h>
+#include <stdint.h>
uint16_t g_firmware_key_version = 0;
uint16_t g_firmware_version = 0;
diff --git a/tests/rsa_padding_test.c b/tests/rsa_padding_test.c
index 4ccb4b4..b565e78 100644
--- a/tests/rsa_padding_test.c
+++ b/tests/rsa_padding_test.c
@@ -7,8 +7,8 @@
#include <stdio.h>
-#include "cryptolib.h"
#include "file_keys.h"
+#include "rsa_utility.h"
int main(int argc, char* argv[]) {
int i;
diff --git a/tests/rsa_padding_test.h b/tests/rsa_padding_test.h
index ce1ab24..2257784 100644
--- a/tests/rsa_padding_test.h
+++ b/tests/rsa_padding_test.h
@@ -12,7 +12,9 @@
#ifndef VBOOT_REFERENCE_RSA_PADDING_TEST_H_
#define VBOOT_REFERENCE_RSA_PADDING_TEST_H_
-#include "cryptolib.h"
+#include <inttypes.h>
+
+#include "rsa.h"
/* The modulus of the public key (RSA-1024). */
static const uint8_t pubkey_n[] = {
diff --git a/tests/rsa_verify_benchmark.c b/tests/rsa_verify_benchmark.c
index ccd6eaf..ba108be 100644
--- a/tests/rsa_verify_benchmark.c
+++ b/tests/rsa_verify_benchmark.c
@@ -6,8 +6,10 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
#include "file_keys.h"
+#include "padding.h"
+#include "rsa.h"
+#include "rsa_utility.h"
#include "timer_utils.h"
#include "utility.h"
diff --git a/tests/sha_benchmark.c b/tests/sha_benchmark.c
index 8532ffa..b36695b 100644
--- a/tests/sha_benchmark.c
+++ b/tests/sha_benchmark.c
@@ -6,7 +6,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cryptolib.h"
+#include "sha.h"
#include "timer_utils.h"
#include "utility.h"
diff --git a/tests/sha_tests.c b/tests/sha_tests.c
index 2b75a03..2c07b3f 100644
--- a/tests/sha_tests.c
+++ b/tests/sha_tests.c
@@ -9,7 +9,8 @@
#include <stdlib.h>
#include <string.h>
-#include "cryptolib.h"
+#include "sha.h"
+
#include "sha_test_vectors.h"
int SHA1_tests(void) {
diff --git a/tests/test_common.c b/tests/test_common.c
index 2591310..b57f6ed 100644
--- a/tests/test_common.c
+++ b/tests/test_common.c
@@ -9,8 +9,8 @@
#include <stdio.h>
-#include "cryptolib.h"
#include "file_keys.h"
+#include "rsa_utility.h"
#include "utility.h"
/* ANSI Color coding sequences. */