diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2010-07-01 10:22:06 -0700 |
|---|---|---|
| committer | Bill Richardson <wfrichar@chromium.org> | 2010-07-01 10:22:06 -0700 |
| commit | abf055045802cb06c57ff2d7b187736bdcb3b138 (patch) | |
| tree | be0cc0aaa1d8c64fb5402b66c975e7e7c018acd1 /tests/kernel_verify_benchmark.c | |
| parent | a08b5c9d032be485fe6e2790c23e8c9bb9fca2ad (diff) | |
| download | vboot-abf055045802cb06c57ff2d7b187736bdcb3b138.tar.gz | |
Switch to using .vbprivk for signing everything now.
This makes it much simpler to keep track of what we're doing.
vbutil_key can now wrap both .keyb and .pem keys. It figures out which is
which by trying both and just using the one that works.
vbutil_keyblock and vbutil_kernel now use .vbprivk files for signing.
replace debug() with VBDEBUG(()) in host-side sources, too.
rename PrivateKeyRead to PrivateKeyReadPem
Add real PrivateKeyRead and PrivateKeyWrite for .vbprivk files.
Review URL: http://codereview.chromium.org/2871033
Diffstat (limited to 'tests/kernel_verify_benchmark.c')
| -rw-r--r-- | tests/kernel_verify_benchmark.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/kernel_verify_benchmark.c b/tests/kernel_verify_benchmark.c index 9ee508c3..c16dfcb8 100644 --- a/tests/kernel_verify_benchmark.c +++ b/tests/kernel_verify_benchmark.c @@ -73,7 +73,7 @@ int SpeedTestAlgorithm(int firmware_sign_algorithm, kernel_key_size); kernel_sign_key = BufferFromFile(file_name, &len); if (!kernel_sign_key) { - debug("Couldn't read pre-processed public kernel signing key.\n"); + VBDEBUG(("Couldn't read pre-processed public kernel signing key.\n")); error_code = 1; goto cleanup; } @@ -89,7 +89,7 @@ int SpeedTestAlgorithm(int firmware_sign_algorithm, firmware_sign_key_file, kernel_sign_key_file); if (!kernel_blobs[i]) { - debug("Couldn't generate test firmware images.\n"); + VBDEBUG(("Couldn't generate test firmware images.\n")); error_code = 1; goto cleanup; } @@ -100,7 +100,7 @@ int SpeedTestAlgorithm(int firmware_sign_algorithm, firmware_key_size); firmware_key_blob = BufferFromFile(file_name, &len); if (!firmware_key_blob) { - debug("Couldn't read pre-processed firmware public key.\n"); + VBDEBUG(("Couldn't read pre-processed firmware public key.\n")); error_code = 1; goto cleanup; } @@ -111,7 +111,7 @@ int SpeedTestAlgorithm(int firmware_sign_algorithm, for (j = 0; j < NUM_OPERATIONS; ++j) { if (VERIFY_KERNEL_SUCCESS != VerifyKernel(firmware_key_blob, kernel_blobs[i], 0)) - debug("Warning: Kernel Verification Failed.\n"); + VBDEBUG(("Warning: Kernel Verification Failed.\n")); } StopTimer(&ct); msecs = (float) GetDurationMsecs(&ct) / NUM_OPERATIONS; |