diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-06-23 13:45:59 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-09-02 01:28:37 -0700 |
| commit | f7559e4b4652134b1e15de3ce31ee50a3de00f69 (patch) | |
| tree | 63c14345dbe8323ad25a428c936a1c51f6ae7fcc /futility/cmd_vbutil_kernel.c | |
| parent | df2bd9b1e74687dfc82a7bacc0b9a3c6162c0504 (diff) | |
| download | vboot-f7559e4b4652134b1e15de3ce31ee50a3de00f69.tar.gz | |
futility: Use vboot 2.0 APIs for public keys
This replaces calls to the old vboot 1 APIs with their vboot 2.0
equivalents.
BUG=chromium:611535
BRANCH=none
TEST=make runtests
Change-Id: Ieb1a127577c6428c47ac088c3aaa0d0dad6275a8
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/356541
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'futility/cmd_vbutil_kernel.c')
| -rw-r--r-- | futility/cmd_vbutil_kernel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c index 274ea75f..cc6b83c0 100644 --- a/futility/cmd_vbutil_kernel.c +++ b/futility/cmd_vbutil_kernel.c @@ -240,7 +240,7 @@ static int do_vbutil_kernel(int argc, char *argv[]) struct vb2_keyblock *keyblock = NULL; struct vb2_keyblock *t_keyblock = NULL; struct vb2_private_key *signpriv_key = NULL; - VbPublicKey *signpub_key = NULL; + struct vb2_packed_key *signpub_key = NULL; uint8_t *kpart_data = NULL; uint64_t kpart_size = 0; uint8_t *vmlinuz_buf = NULL; @@ -547,7 +547,7 @@ static int do_vbutil_kernel(int argc, char *argv[]) /* Optional */ if (signpubkey_file) { - signpub_key = PublicKeyRead(signpubkey_file); + signpub_key = vb2_read_packed_key(signpubkey_file); if (!signpub_key) Fatal("Error reading public key.\n"); } |