summaryrefslogtreecommitdiff
path: root/futility/vb1_helper.h
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2016-06-21 15:23:32 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-08-10 15:30:33 -0700
commit939cc3a5c25a3333fadafc7fc341d7e320f72fab (patch)
treebd7197c8950f44440459fc50531037d50719d3b7 /futility/vb1_helper.h
parent814aaf09ceecddb16a01e1cbe0df4299b83b5699 (diff)
downloadvboot-939cc3a5c25a3333fadafc7fc341d7e320f72fab.tar.gz
futility: Use only vboot 2.0 APIs for keyblocks
This refactors futility and the host library to use only vboot 2.0 APIs to create and verify keyblocks. BUG=chromium:611535 BRANCH=none TEST=make runtests Change-Id: Ia3cc1e24971b94f01bcb4890c8666a3af6f84841 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/356129 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'futility/vb1_helper.h')
-rw-r--r--futility/vb1_helper.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/futility/vb1_helper.h b/futility/vb1_helper.h
index 8f3b5000..ec0f0004 100644
--- a/futility/vb1_helper.h
+++ b/futility/vb1_helper.h
@@ -7,6 +7,7 @@
#define VBOOT_REFERENCE_FUTILITY_VB1_HELPER_H_
struct vb2_kernel_preamble;
+struct vb2_keyblock;
struct vb2_packed_key;
/**
@@ -33,7 +34,8 @@ uint8_t *CreateKernelBlob(uint8_t *vmlinuz_buf, uint64_t vmlinuz_size,
uint8_t *SignKernelBlob(uint8_t *kernel_blob, uint64_t kernel_size,
uint64_t padding,
int version, uint64_t kernel_body_load_address,
- VbKeyBlockHeader *keyblock, VbPrivateKey *signpriv_key,
+ struct vb2_keyblock *keyblock,
+ VbPrivateKey *signpriv_key,
uint32_t flags, uint64_t *vblock_size_ptr);
int WriteSomeParts(const char *outfile,
@@ -42,7 +44,7 @@ int WriteSomeParts(const char *outfile,
uint8_t *UnpackKPart(uint8_t *kpart_data, uint64_t kpart_size,
uint64_t padding,
- VbKeyBlockHeader **keyblock_ptr,
+ struct vb2_keyblock **keyblock_ptr,
VbKernelPreambleHeader **preamble_ptr,
uint64_t *blob_size_ptr);