aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2014-10-23 17:38:18 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-10-29 22:23:49 +0000
commitd274a2e9536907d0474d988f32f602cd64ed1ae6 (patch)
tree2119babccda38dc38f6d7bb35c23e53ad9077b29 /Makefile
parentf6cfb974ce465cf977490fe26db9c8735da97571 (diff)
downloadvboot_reference-d274a2e9536907d0474d988f32f602cd64ed1ae6.tar.gz
vboot2: Add vb2_unpack_key2() and unit tests
This unpacks new-style packed keys. For now, it can also handle old-style packed keys by passing them to the old unpacking function. Once we've switched over to new-style keys in the signing scripts, we'll remove the old format to save code size. Also added is a test library which converts from old to new struct formats. That should eventually get absorbed into futility, and the test keys directory should have both old and new format packed keys in it. BUG=chromium:423882 BRANCH=none TEST=VBOOT2=1 make runtests Change-Id: I0fe31f124781d1ea1efedab65dcd6130bfca18dd Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/225490 Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c344b08f..2a3585ce 100644
--- a/Makefile
+++ b/Makefile
@@ -287,6 +287,7 @@ FWLIB2_SRCS = \
firmware/2lib/2misc.c \
firmware/2lib/2nvstorage.c \
firmware/2lib/2packed_key.c \
+ firmware/2lib/2packed_key2.c \
firmware/2lib/2rsa.c \
firmware/2lib/2secdata.c \
firmware/2lib/2sha1.c \
@@ -579,6 +580,11 @@ TESTLIB_SRCS = \
tests/timer_utils.c \
tests/crc32_test.c
+ifneq (${VBOOT2},)
+TESTLIB_SRCS += \
+ tests/vb2_convert_structs.c
+endif
+
TESTLIB_OBJS = ${TESTLIB_SRCS:%.c=${BUILD}/%.o}
TEST_OBJS += ${TESTLIB_OBJS}