diff options
| author | Joel Kitching <kitching@google.com> | 2021-01-18 15:08:44 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-20 11:30:11 +0000 |
| commit | a3abedfc06f16690c858242c037b1cf47da00288 (patch) | |
| tree | 77f03d41057d09c264079b9c6ac10edd8b3fcc46 | |
| parent | 0249329a6aadc70c15d2b70c2cc6efdb115d4e6a (diff) | |
| download | vboot-a3abedfc06f16690c858242c037b1cf47da00288.tar.gz | |
vboot: move lib20/misc.c into 2lib namespace
lib20/misc.c contains only functions related to firmware
verification, which are currently called from 2lib/2api.c,
so move this to 2lib/2firmware.c.
Move its unit test file accordingly.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: Ibaeea168ed5055d47d4be86f5b3bb0f803f97dad
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2635219
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | firmware/2lib/2firmware.c (renamed from firmware/lib20/misc.c) | 0 | ||||
| -rw-r--r-- | tests/vb2_firmware_tests.c (renamed from tests/vb20_misc_tests.c) | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -376,6 +376,7 @@ FWLIB_SRCS = \ firmware/2lib/2crc8.c \ firmware/2lib/2crypto.c \ firmware/2lib/2ec_sync.c \ + firmware/2lib/2firmware.c \ firmware/2lib/2gbb.c \ firmware/2lib/2hmac.c \ firmware/2lib/2kernel.c \ @@ -400,7 +401,6 @@ FWLIB_SRCS = \ firmware/lib/vboot_kernel.c \ firmware/lib20/api_kernel.c \ firmware/lib20/kernel.c \ - firmware/lib20/misc.c \ firmware/lib20/packed_key.c # Only add these to firmware and test builds, @@ -716,6 +716,7 @@ TEST2X_NAMES = \ tests/vb2_common3_tests \ tests/vb2_crypto_tests \ tests/vb2_ec_sync_tests \ + tests/vb2_firmware_tests \ tests/vb2_gbb_tests \ tests/vb2_host_flashrom_tests \ tests/vb2_host_key_tests \ @@ -739,7 +740,6 @@ TEST20_NAMES = \ tests/vb20_api_kernel_tests \ tests/vb20_verify_fw.c \ tests/vb20_kernel_tests \ - tests/vb20_misc_tests \ tests/vb20_rsa_padding_tests \ tests/vb20_verify_fw @@ -1246,6 +1246,7 @@ run2tests: install_for_test ${RUNTEST} ${BUILD_RUN}/tests/vb2_common3_tests ${TEST_KEYS} ${RUNTEST} ${BUILD_RUN}/tests/vb2_crypto_tests ${RUNTEST} ${BUILD_RUN}/tests/vb2_ec_sync_tests + ${RUNTEST} ${BUILD_RUN}/tests/vb2_firmware_tests ${RUNTEST} ${BUILD_RUN}/tests/vb2_gbb_tests ${RUNTEST} ${BUILD_RUN}/tests/vb2_host_key_tests ${RUNTEST} ${BUILD_RUN}/tests/vb2_kernel_tests @@ -1262,7 +1263,6 @@ run2tests: install_for_test ${RUNTEST} ${BUILD_RUN}/tests/vb2_ui_utility_tests ${RUNTEST} ${BUILD_RUN}/tests/vb20_api_kernel_tests ${RUNTEST} ${BUILD_RUN}/tests/vb20_kernel_tests - ${RUNTEST} ${BUILD_RUN}/tests/vb20_misc_tests ${RUNTEST} ${BUILD_RUN}/tests/vb21_host_common_tests ${RUNTEST} ${BUILD_RUN}/tests/vb21_host_common2_tests ${TEST_KEYS} ${RUNTEST} ${BUILD_RUN}/tests/vb21_host_key_tests ${TEST_KEYS} ${BUILD} diff --git a/firmware/lib20/misc.c b/firmware/2lib/2firmware.c index bc8e9955..bc8e9955 100644 --- a/firmware/lib20/misc.c +++ b/firmware/2lib/2firmware.c diff --git a/tests/vb20_misc_tests.c b/tests/vb2_firmware_tests.c index fdab37e3..0e0c85f8 100644 --- a/tests/vb20_misc_tests.c +++ b/tests/vb2_firmware_tests.c @@ -2,7 +2,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * - * Tests for misc library + * Tests for firmware verification library */ #include <stdio.h> |