summaryrefslogtreecommitdiff
path: root/futility
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 /futility
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 'futility')
-rw-r--r--futility/cmd_create.c1
-rw-r--r--futility/cmd_vbutil_firmware.c1
-rw-r--r--futility/cmd_vbutil_key.c1
-rw-r--r--futility/cmd_vbutil_keyblock.c1
4 files changed, 0 insertions, 4 deletions
diff --git a/futility/cmd_create.c b/futility/cmd_create.c
index aca1d4c0..16a37332 100644
--- a/futility/cmd_create.c
+++ b/futility/cmd_create.c
@@ -22,7 +22,6 @@
#include "host_misc21.h"
#include "openssl_compat.h"
#include "util_misc.h"
-#include "vb2_common.h"
#include "vboot_host.h"
/* Command line options */
diff --git a/futility/cmd_vbutil_firmware.c b/futility/cmd_vbutil_firmware.c
index 7659ed25..b7155f7b 100644
--- a/futility/cmd_vbutil_firmware.c
+++ b/futility/cmd_vbutil_firmware.c
@@ -22,7 +22,6 @@
#include "kernel_blob.h"
#include "util_misc.h"
#include "vb1_helper.h"
-#include "vb2_common.h"
/* Command line options */
enum {
diff --git a/futility/cmd_vbutil_key.c b/futility/cmd_vbutil_key.c
index 0d812540..d26df3ff 100644
--- a/futility/cmd_vbutil_key.c
+++ b/futility/cmd_vbutil_key.c
@@ -17,7 +17,6 @@
#include "host_key21.h"
#include "util_misc.h"
#include "vb1_helper.h"
-#include "vb2_common.h"
/* Command line options */
enum {
diff --git a/futility/cmd_vbutil_keyblock.c b/futility/cmd_vbutil_keyblock.c
index 977b4aa4..bec23c39 100644
--- a/futility/cmd_vbutil_keyblock.c
+++ b/futility/cmd_vbutil_keyblock.c
@@ -19,7 +19,6 @@
#include "host_key21.h"
#include "util_misc.h"
#include "vb1_helper.h"
-#include "vb2_common.h"
/* Command line options */
enum {