From f7559e4b4652134b1e15de3ce31ee50a3de00f69 Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Thu, 23 Jun 2016 13:45:59 -0700 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/356541 Reviewed-by: Daisuke Nojiri --- futility/cmd_vbutil_keyblock.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'futility/cmd_vbutil_keyblock.c') diff --git a/futility/cmd_vbutil_keyblock.c b/futility/cmd_vbutil_keyblock.c index 27624931..246616b8 100644 --- a/futility/cmd_vbutil_keyblock.c +++ b/futility/cmd_vbutil_keyblock.c @@ -225,14 +225,12 @@ static int Unpack(const char *infile, const char *datapubkey, vb1_crypto_name(data_key->algorithm)); printf("Data key version: %u\n", data_key->key_version); printf("Data key sha1sum: %s\n", - packed_key_sha1_string((struct vb2_packed_key *)data_key)); + packed_key_sha1_string(data_key)); - if (datapubkey) { - if (0 != PublicKeyWrite(datapubkey, (VbPublicKey *)data_key)) { - fprintf(stderr, "vbutil_keyblock:" - " unable to write public key\n"); - return 1; - } + if (datapubkey && + VB2_SUCCESS != vb2_write_packed_key(datapubkey, data_key)) { + fprintf(stderr, "vbutil_keyblock: error writing public key\n"); + return 1; } free(block); -- cgit v1.2.1