diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-05-11 13:50:18 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-07-22 18:40:04 -0700 |
| commit | 7c3ae42e045935728a63a6d592ecf6c5bdbd005a (patch) | |
| tree | b03c1bde6af714d2229b2362ad1d64b99c8f581d /Makefile | |
| parent | b3a625f8fef1768d78eab4cfaaea270cb3fbd0c3 (diff) | |
| download | vboot-7c3ae42e045935728a63a6d592ecf6c5bdbd005a.tar.gz | |
vboot: Convert vboot1 SHA calls to use vboot2
This change replaces all calls to the old vboot1 SHA library with their
vboot2 equivalents.
This is the first in a long series of changes to move the core vboot kernel
verification into vb2, and the control/display loop out to depthcharge.
BUG=chromium:611535
BRANCH=none
TEST=make runtests; build samus firmware and boot it
Change-Id: I31986eb766176c0e39a192c5ce15730471c3cf94
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/344342
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 4 insertions, 10 deletions
@@ -327,10 +327,6 @@ VBSF_SRCS = \ firmware/lib/cryptolib/padding.c \ firmware/lib/cryptolib/rsa.c \ firmware/lib/cryptolib/rsa_utility.c \ - firmware/lib/cryptolib/sha1.c \ - firmware/lib/cryptolib/sha256.c \ - firmware/lib/cryptolib/sha512.c \ - firmware/lib/cryptolib/sha_utility.c \ firmware/lib/stateful_util.c \ firmware/lib/vboot_api_firmware.c \ firmware/lib/vboot_common.c \ @@ -737,7 +733,6 @@ TEST_NAMES = \ tests/rsa_utility_tests \ tests/rsa_verify_benchmark \ tests/sha_benchmark \ - tests/sha_tests \ tests/stateful_util_tests \ tests/tpm_bootmode_tests \ tests/utility_string_tests \ @@ -949,8 +944,8 @@ ${BDBLIB_OBJS}: INCLUDES += -Ifirmware/bdb ${BUILD}/firmware/linktest/main_vbinit: ${VBINIT_OBJS} ${BUILD}/firmware/linktest/main_vbinit: OBJS = ${VBINIT_OBJS} TEST_OBJS += ${BUILD}/firmware/linktest/main_vbinit.o -${BUILD}/firmware/linktest/main_vbsf: ${VBSF_OBJS} -${BUILD}/firmware/linktest/main_vbsf: OBJS = ${VBSF_OBJS} +${BUILD}/firmware/linktest/main_vbsf: ${FWLIB} +${BUILD}/firmware/linktest/main_vbsf: LIBS = ${FWLIB} TEST_OBJS += ${BUILD}/firmware/linktest/main_vbsf.o ${BUILD}/firmware/linktest/main: ${FWLIB} ${BUILD}/firmware/linktest/main: LIBS = ${FWLIB} @@ -965,7 +960,7 @@ fwlinktest: \ .PHONY: fwlib fwlib: $(if ${FIRMWARE_ARCH},${FWLIB},fwlinktest) -${FWLIB}: ${FWLIB_OBJS} +${FWLIB}: ${FWLIB_OBJS} ${FWLIB2X_OBJS} @${PRINTF} " RM $(subst ${BUILD}/,,$@)\n" ${Q}rm -f $@ @${PRINTF} " AR $(subst ${BUILD}/,,$@)\n" @@ -1020,7 +1015,7 @@ utillib: ${UTILLIB} \ ${BUILD}/host/linktest/main # TODO: better way to make .a than duplicating this recipe each time? -${UTILLIB}: ${UTILLIB_OBJS} ${FWLIB_OBJS} +${UTILLIB}: ${UTILLIB_OBJS} ${FWLIB_OBJS} ${FWLIB2X_OBJS} @${PRINTF} " RM $(subst ${BUILD}/,,$@)\n" ${Q}rm -f $@ @${PRINTF} " AR $(subst ${BUILD}/,,$@)\n" @@ -1459,7 +1454,6 @@ runmisctests: test_setup ${RUNTEST} ${BUILD_RUN}/tests/rollback_index2_tests ${RUNTEST} ${BUILD_RUN}/tests/rollback_index3_tests ${RUNTEST} ${BUILD_RUN}/tests/rsa_utility_tests - ${RUNTEST} ${BUILD_RUN}/tests/sha_tests ${RUNTEST} ${BUILD_RUN}/tests/stateful_util_tests ${RUNTEST} ${BUILD_RUN}/tests/tlcl_tests ${RUNTEST} ${BUILD_RUN}/tests/tpm_bootmode_tests |