diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-10-14 15:37:25 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-10-29 19:41:09 -0700 |
| commit | 5a9f498182586f64865b51c874619d674f5d842c (patch) | |
| tree | 79f69ff6aa363b6f53e010773f20f5f22771e06c /Makefile | |
| parent | 13b109762a3bfec025a9bfcb3ead927d0291280e (diff) | |
| download | vboot-5a9f498182586f64865b51c874619d674f5d842c.tar.gz | |
host,test: Remove unneeded vb1 rsa functions
Another in a continued stream of refactoring. This change removes more
of the vb1 rsa library code and associated tests, in favor of their vb2
equivalents. This change touches only host-side code and its tests, not
firmware.
BUG=chromium:611535
BRANCH=none
TEST=make runtests; emerge-kevin coreboot depthcharge
Change-Id: I1973bc2f03c60da62232e30bab0fa5fe791b6b34
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/400901
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -324,8 +324,6 @@ VBINIT_SRCS = \ # Additional firmware library sources needed by VbSelectFirmware() call VBSF_SRCS = \ firmware/lib/cryptolib/padding.c \ - firmware/lib/cryptolib/rsa.c \ - firmware/lib/cryptolib/rsa_utility.c \ firmware/lib/stateful_util.c \ firmware/lib/vboot_common.c \ firmware/lib/region-fw.c \ @@ -724,9 +722,6 @@ TEST_OBJS += ${TESTLIB_OBJS} TEST_NAMES = \ tests/cgptlib_test \ tests/rollback_index3_tests \ - tests/rsa_padding_test \ - tests/rsa_utility_tests \ - tests/rsa_verify_benchmark \ tests/sha_benchmark \ tests/stateful_util_tests \ tests/utility_string_tests \ @@ -1187,6 +1182,7 @@ ${TEST2X_BINS}: LIBS += ${FWLIB2X} ${TEST20_BINS}: ${FWLIB20} ${TEST20_BINS}: LIBS += ${FWLIB20} +${TEST20_BINS}: LDLIBS += ${CRYPTO_LIBS} ${TESTBDB_BINS}: ${FWLIB2X} ${UTILBDB} ${TESTBDB_BINS}: INCLUDES += -Ifirmware/bdb @@ -1251,6 +1247,7 @@ CRYPTO_LIBS := $(shell ${PKG_CONFIG} --libs libcrypto) ${BUILD}/utility/dumpRSAPublicKey: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/utility/pad_digest_utility: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/utility/signature_digest_utility: LDLIBS += ${CRYPTO_LIBS} +${BUILD}/utility/verify_data: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/utility/bdb_extend: ${FWLIB2X} ${UTILBDB} ${BUILD}/utility/bdb_extend.o: INCLUDES += -Ifirmware/bdb @@ -1408,7 +1405,6 @@ runtestscripts: test_setup genfuzztestcases tests/run_cgpt_tests.sh ${BUILD_RUN}/cgpt/cgpt tests/run_cgpt_tests.sh ${BUILD_RUN}/cgpt/cgpt -D 358400 tests/run_preamble_tests.sh - tests/run_rsa_tests.sh tests/run_vbutil_kernel_arg_tests.sh tests/run_vbutil_tests.sh tests/vb2_rsa_tests.sh @@ -1421,7 +1417,6 @@ ifeq (${TPM2_MODE},) ${RUNTEST} ${BUILD_RUN}/tests/rollback_index2_tests endif ${RUNTEST} ${BUILD_RUN}/tests/rollback_index3_tests - ${RUNTEST} ${BUILD_RUN}/tests/rsa_utility_tests ${RUNTEST} ${BUILD_RUN}/tests/stateful_util_tests ${RUNTEST} ${BUILD_RUN}/tests/utility_string_tests ${RUNTEST} ${BUILD_RUN}/tests/utility_tests |