summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2021-01-18 15:37:56 +0800
committerCommit Bot <commit-bot@chromium.org>2021-01-20 11:30:12 +0000
commita82bb0e0ed2e4e282d15781816ee3ad783d6fa34 (patch)
treea362cb5b1bb97ba9f9c8c51cb86abcbf6cd10706 /tests
parenta3abedfc06f16690c858242c037b1cf47da00288 (diff)
downloadvboot-a82bb0e0ed2e4e282d15781816ee3ad783d6fa34.tar.gz
vboot: move lib20/packed_key.c into 2lib namespace
lib20/packed_key.c functions are currently called throughout 2lib namespace, so move to 2lib/2packed_key.c. Move function declarations from vb2_common.h to 2packed_key.h, and include 2packed_key.h from 2common.h. BUG=b:124141368, chromium:968464 TEST=make clean && make runtests BRANCH=none Signed-off-by: Joel Kitching <kitching@google.com> Change-Id: I151b2d41cbbfa1bfd03de301bd4ee69c49e81f3b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2635220 Tested-by: Joel Kitching <kitching@chromium.org> Reviewed-by: Yu-Ping Wu <yupingso@chromium.org> Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/vb20_api_kernel_tests.c1
-rw-r--r--tests/vb20_rsa_padding_tests.c2
-rw-r--r--tests/vb2_api_tests.c1
-rw-r--r--tests/vb2_common2_tests.c2
-rw-r--r--tests/vb2_firmware_tests.c1
-rw-r--r--tests/vb2_kernel_tests.c1
6 files changed, 2 insertions, 6 deletions
diff --git a/tests/vb20_api_kernel_tests.c b/tests/vb20_api_kernel_tests.c
index 676cb198..893cd4e4 100644
--- a/tests/vb20_api_kernel_tests.c
+++ b/tests/vb20_api_kernel_tests.c
@@ -15,7 +15,6 @@
#include "2secdata.h"
#include "2sysincludes.h"
#include "test_common.h"
-#include "vb2_common.h"
#include "vboot_struct.h"
/* Common context for tests */
diff --git a/tests/vb20_rsa_padding_tests.c b/tests/vb20_rsa_padding_tests.c
index 03a38ee1..90ff42ae 100644
--- a/tests/vb20_rsa_padding_tests.c
+++ b/tests/vb20_rsa_padding_tests.c
@@ -6,13 +6,13 @@
#include <stdint.h>
#include <stdio.h>
+#include "2common.h"
#include "2rsa.h"
#include "2sysincludes.h"
#include "file_keys.h"
#include "host_key.h"
#include "rsa_padding_test.h"
#include "test_common.h"
-#include "vb2_common.h"
vb2_error_t hwcrypto_modexp_return_value = VB2_SUCCESS;
vb2_error_t vb2ex_hwcrypto_modexp(const struct vb2_public_key *key,
diff --git a/tests/vb2_api_tests.c b/tests/vb2_api_tests.c
index 1fabb60b..40fdf593 100644
--- a/tests/vb2_api_tests.c
+++ b/tests/vb2_api_tests.c
@@ -15,7 +15,6 @@
#include "2secdata.h"
#include "2sysincludes.h"
#include "test_common.h"
-#include "vb2_common.h"
/* Common context for tests */
diff --git a/tests/vb2_common2_tests.c b/tests/vb2_common2_tests.c
index 89a560c4..b1666ab6 100644
--- a/tests/vb2_common2_tests.c
+++ b/tests/vb2_common2_tests.c
@@ -9,13 +9,13 @@
#include <stdio.h>
#include <string.h>
+#include "2common.h"
#include "2rsa.h"
#include "2sysincludes.h"
#include "file_keys.h"
#include "host_common.h"
#include "host_key21.h"
#include "test_common.h"
-#include "vb2_common.h"
static const uint8_t test_data[] = "This is some test data to sign.";
static const uint32_t test_size = sizeof(test_data);
diff --git a/tests/vb2_firmware_tests.c b/tests/vb2_firmware_tests.c
index 0e0c85f8..681e5d67 100644
--- a/tests/vb2_firmware_tests.c
+++ b/tests/vb2_firmware_tests.c
@@ -15,7 +15,6 @@
#include "2secdata.h"
#include "2sysincludes.h"
#include "test_common.h"
-#include "vb2_common.h"
/* Common context for tests */
static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]
diff --git a/tests/vb2_kernel_tests.c b/tests/vb2_kernel_tests.c
index 4b0a2494..ebddafcd 100644
--- a/tests/vb2_kernel_tests.c
+++ b/tests/vb2_kernel_tests.c
@@ -14,7 +14,6 @@
#include "2secdata.h"
#include "2sysincludes.h"
#include "test_common.h"
-#include "vb2_common.h"
#include "vboot_struct.h"
/* Common context for tests */