diff options
author | Daisuke Nojiri <dnojiri@chromium.org> | 2016-05-03 16:23:53 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2016-05-04 11:34:08 -0700 |
commit | edc3c8e4409bd9bd5cccac8a2fe48ddd5927fa6a (patch) | |
tree | 2fd95d5a9af2641d3c885dc19ce8e6c03d246782 /Makefile | |
parent | 825a2f8c7315520f62f6bb981b24f075ed5136e8 (diff) | |
download | vboot-edc3c8e4409bd9bd5cccac8a2fe48ddd5927fa6a.tar.gz |
bdb: Replace sha functions with vb2 library
BDB has its own implementation of SHA256. This patch replaces it with
the one implemented in vb2 library.
BUG=chrome-os-partner:51908
BRANCH=tot
TEST=build runtests
Change-Id: Ida19dd49153a038fc2b2ce481cedf828818aaeaa
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/342121
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -374,7 +374,6 @@ FWLIB21_SRCS = \ BDBLIB_SRCS = \ firmware/bdb/bdb.c \ - firmware/bdb/sha.c \ firmware/bdb/rsa.c # Support real TPM unless BIOS sets MOCK_TPM @@ -962,7 +961,7 @@ ${FWLIB21}: ${FWLIB2X_OBJS} ${FWLIB21_OBJS} .PHONY: bdblib bdblib: ${BDBLIB} -${BDBLIB}: ${BDBLIB_OBJS} +${BDBLIB}: ${FWLIB2X_OBJS} ${BDBLIB_OBJS} @${PRINTF} " RM $(subst ${BUILD}/,,$@)\n" ${Q}rm -f $@ @${PRINTF} " AR $(subst ${BUILD}/,,$@)\n" @@ -1189,9 +1188,9 @@ ${TEST21_BINS}: ${UTILLIB21} ${TEST21_BINS}: INCLUDES += -Ihost/lib21/include -Ifirmware/lib21/include ${TEST21_BINS}: LIBS += ${UTILLIB21} -${TESTBDB_BINS}: ${UTILBDB} +${TESTBDB_BINS}: ${FWLIB2X} ${UTILBDB} ${TESTBDB_BINS}: INCLUDES += -Ifirmware/bdb -${TESTBDB_BINS}: LIBS += ${UTILBDB_OBJS} ${BDBLIB_OBJS} +${TESTBDB_BINS}: LIBS += ${FWLIB2X} ${UTILBDB_OBJS} ${BDBLIB_OBJS} ${TESTLIB}: ${TESTLIB_OBJS} @${PRINTF} " RM $(subst ${BUILD}/,,$@)\n" |