diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2014-07-14 16:19:59 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-07-17 06:50:46 +0000 |
| commit | 884a5f10c1a0c7a37848aef7669e1c735b779cc7 (patch) | |
| tree | 95cb08af24404998f9b3e80b4339dbaf64c5a860 | |
| parent | b84b81dc265a766a968bf126905447d442558218 (diff) | |
| download | vboot-884a5f10c1a0c7a37848aef7669e1c735b779cc7.tar.gz | |
futility: add vbutil_keyblock into the built-in features
BUG=chromium:224734
BRANCH=ToT
TEST=make runtests
Change-Id: Ie9efdcf0b69ab4697f050643b8f2f588e22d20d7
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/208368
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | futility/cmd_vbutil_keyblock.c (renamed from utility/vbutil_keyblock.c) | 6 | ||||
| -rwxr-xr-x | tests/futility/run_test_scripts.sh | 2 |
3 files changed, 8 insertions, 5 deletions
@@ -487,8 +487,7 @@ UTIL_NAMES = ${UTIL_NAMES_STATIC} \ utility/tpm_init_temp_fix \ utility/tpmc \ utility/vbutil_firmware \ - utility/vbutil_kernel \ - utility/vbutil_keyblock \ + utility/vbutil_kernel ifeq (${MINIMAL},) UTIL_NAMES += \ @@ -552,6 +551,7 @@ FUTIL_STATIC_SRCS = \ FUTIL_SRCS = \ $(FUTIL_STATIC_SRCS) \ futility/cmd_vbutil_key.c \ + futility/cmd_vbutil_keyblock.c \ futility/cmd_hey.c FUTIL_LDS = futility/futility.lds @@ -997,7 +997,6 @@ ${BUILD}/utility/signature_digest_utility: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/utility/dev_sign_file: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/utility/vbutil_firmware: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/utility/vbutil_kernel: LDLIBS += ${CRYPTO_LIBS} -${BUILD}/utility/vbutil_keyblock: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/host/linktest/main: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/tests/vb2_common2_tests: LDLIBS += ${CRYPTO_LIBS} diff --git a/utility/vbutil_keyblock.c b/futility/cmd_vbutil_keyblock.c index 17614580..d15afd89 100644 --- a/utility/vbutil_keyblock.c +++ b/futility/cmd_vbutil_keyblock.c @@ -12,6 +12,7 @@ #include <string.h> #include "cryptolib.h" +#include "futility.h" #include "host_common.h" #include "util_misc.h" #include "vboot_common.h" @@ -213,7 +214,7 @@ static int Unpack(const char* infile, const char* datapubkey, } -int main(int argc, char* argv[]) { +int do_vbutil_keyblock(int argc, char* argv[]) { char* filename = NULL; char* datapubkey = NULL; @@ -323,3 +324,6 @@ int main(int argc, char* argv[]) { return PrintHelp(progname); } } + +DECLARE_FUTIL_COMMAND(vbutil_keyblock, do_vbutil_keyblock, + "Verified boot key block utility"); diff --git a/tests/futility/run_test_scripts.sh b/tests/futility/run_test_scripts.sh index 87ce0b9b..f8c25ef9 100755 --- a/tests/futility/run_test_scripts.sh +++ b/tests/futility/run_test_scripts.sh @@ -52,7 +52,7 @@ progs=0 PROGS=${*:-cgpt crossystem dev_sign_file dumpRSAPublicKey dump_kernel_config enable_dev_usb_boot gbb_utility tpm_init_temp_fix tpmc vbutil_firmware vbutil_kernel - vbutil_keyblock vbutil_what_keys} + vbutil_what_keys} # For now just compare results of invoking each program with no args. # TODO: Create true rigorous tests for every program. |