diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-06-22 16:46:23 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-08-10 15:30:35 -0700 |
| commit | d46461cec2aa7547b3722623b85dcfb2f298f859 (patch) | |
| tree | 11b05a5b426a2608d38ae19d28a0e9af70b9ec64 /futility/cmd_vbutil_kernel.c | |
| parent | 939cc3a5c25a3333fadafc7fc341d7e320f72fab (diff) | |
| download | vboot-d46461cec2aa7547b3722623b85dcfb2f298f859.tar.gz | |
futility: Use vboot 2.0 APIs for private keys
This replaces calls to the vboot 1 host library with their vboot 2.0
equivalents.
BUG=chromium:611535
BRANCH=none
TEST=make runtests
Change-Id: Id061554fd82ea3efe35d0fe1485693b47599a863
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/356540
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'futility/cmd_vbutil_kernel.c')
| -rw-r--r-- | futility/cmd_vbutil_kernel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c index cf8b26e0..274ea75f 100644 --- a/futility/cmd_vbutil_kernel.c +++ b/futility/cmd_vbutil_kernel.c @@ -239,7 +239,7 @@ static int do_vbutil_kernel(int argc, char *argv[]) int rv; struct vb2_keyblock *keyblock = NULL; struct vb2_keyblock *t_keyblock = NULL; - VbPrivateKey *signpriv_key = NULL; + struct vb2_private_key *signpriv_key = NULL; VbPublicKey *signpub_key = NULL; uint8_t *kpart_data = NULL; uint64_t kpart_size = 0; @@ -403,7 +403,7 @@ static int do_vbutil_kernel(int argc, char *argv[]) if (!signprivkey_file) Fatal("Missing required signprivate file.\n"); - signpriv_key = PrivateKeyRead(signprivkey_file); + signpriv_key = vb2_read_private_key(signprivkey_file); if (!signpriv_key) Fatal("Error reading signing key.\n"); @@ -475,7 +475,7 @@ static int do_vbutil_kernel(int argc, char *argv[]) if (!signprivkey_file) Fatal("Missing required signprivate file.\n"); - signpriv_key = PrivateKeyRead(signprivkey_file); + signpriv_key = vb2_read_private_key(signprivkey_file); if (!signpriv_key) Fatal("Error reading signing key.\n"); |