summaryrefslogtreecommitdiff
path: root/host
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 /host
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 'host')
-rw-r--r--host/lib/host_common.c1
-rw-r--r--host/lib/host_key2.c1
-rw-r--r--host/lib/host_signature.c1
-rw-r--r--host/lib/host_signature2.c1
-rw-r--r--host/lib/util_misc.c1
5 files changed, 0 insertions, 5 deletions
diff --git a/host/lib/host_common.c b/host/lib/host_common.c
index 63b45f2e..1dc7a542 100644
--- a/host/lib/host_common.c
+++ b/host/lib/host_common.c
@@ -12,7 +12,6 @@
#include "2sysincludes.h"
#include "host_common.h"
#include "host_key21.h"
-#include "vb2_common.h"
struct vb2_fw_preamble *vb2_create_fw_preamble(
uint32_t firmware_version,
diff --git a/host/lib/host_key2.c b/host/lib/host_key2.c
index 913c6dfa..e2e3f318 100644
--- a/host/lib/host_key2.c
+++ b/host/lib/host_key2.c
@@ -19,7 +19,6 @@
#include "host_key21.h"
#include "host_key.h"
#include "host_misc.h"
-#include "vb2_common.h"
enum vb2_crypto_algorithm vb2_get_crypto_algorithm(
enum vb2_hash_algorithm hash_alg,
diff --git a/host/lib/host_signature.c b/host/lib/host_signature.c
index db536c6e..5b71d29a 100644
--- a/host/lib/host_signature.c
+++ b/host/lib/host_signature.c
@@ -21,7 +21,6 @@
#include "2sysincludes.h"
#include "host_common.h"
#include "host_signature21.h"
-#include "vb2_common.h"
/* Invoke [external_signer] command with [pem_file] as an argument, contents of
* [inbuf] passed redirected to stdin, and the stdout of the command is put
diff --git a/host/lib/host_signature2.c b/host/lib/host_signature2.c
index f7caa71f..b6cd6520 100644
--- a/host/lib/host_signature2.c
+++ b/host/lib/host_signature2.c
@@ -22,7 +22,6 @@
#include "host_common.h"
#include "host_key21.h"
#include "host_signature21.h"
-#include "vb2_common.h"
struct vb2_signature *vb2_alloc_signature(uint32_t sig_size,
uint32_t data_size)
diff --git a/host/lib/util_misc.c b/host/lib/util_misc.c
index c99947f0..26f7dac8 100644
--- a/host/lib/util_misc.c
+++ b/host/lib/util_misc.c
@@ -20,7 +20,6 @@
#include "host_key21.h"
#include "openssl_compat.h"
#include "util_misc.h"
-#include "vb2_common.h"
const char *packed_key_sha1_string(const struct vb2_packed_key *key)
{