summaryrefslogtreecommitdiff
path: root/test/build.mk
diff options
context:
space:
mode:
authorVadim Sukhomlinov <sukhomlinov@google.com>2021-07-16 23:51:06 -0700
committerCommit Bot <commit-bot@chromium.org>2021-09-02 00:51:52 +0000
commit4b109d0b957a66bb9e6726f54db22d55452999b2 (patch)
tree7e5bee5162759297d1c0deb1916c1c4ae3d622f0 /test/build.mk
parentdc96ffc9dc48af55ba79846cd954ce55821b31eb (diff)
downloadchrome-ec-4b109d0b957a66bb9e6726f54db22d55452999b2.tar.gz
u2f: refactoring to split command processing and crypto
Split U2F crypto from U2F command processing by moving all crypto code into boards/cr50 (platform hooks). U2F state management is part of common code and passed to U2F crypto as a parameter. Previously reviewed as https://crrev.com/c/3034852, but reverted due to ChromeOS dependency on include/u2f.h. In this revision this is addressed by restoring include/u2f.h with previous content and new additions and adjusting dependencies in other headers. BUG=b:134594373 TEST=make BOARD=cr50 CRYPTO_TEST=1 console: u2f_test test/tpmtest.py FAFT U2F tests pass Signed-off-by: Vadim Sukhomlinov <sukhomlinov@google.com> Change-Id: Iff1973c8e475216b801d7adde23b1ef6c4a6f699 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3119223 Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org> Reviewed-by: Andrey Pronin <apronin@chromium.org> Tested-by: Vadim Sukhomlinov <sukhomlinov@chromium.org> Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'test/build.mk')
-rw-r--r--test/build.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/build.mk b/test/build.mk
index 7555778e70..8efc82f5f0 100644
--- a/test/build.mk
+++ b/test/build.mk
@@ -95,6 +95,7 @@ thermal-y=thermal.o
timer_calib-y=timer_calib.o
timer_dos-y=timer_dos.o
u2f-y=u2f.o
+u2f-y+=../board/cr50/u2f.o
uptime-y=uptime.o
utils-y=utils.o
utils_str-y=utils_str.o
@@ -107,6 +108,7 @@ TPM2_ROOT := $(CROS_WORKON_SRCROOT)/src/third_party/tpm2
$(out)/RO/common/new_nvmem.o: CFLAGS += -I$(TPM2_ROOT) -I chip/g
$(out)/RO/test/nvmem.o: CFLAGS += -I$(TPM2_ROOT)
$(out)/RO/test/nvmem_tpm2_mock.o: CFLAGS += -I$(TPM2_ROOT)
+$(out)/RO/common/u2f.o: CFLAGS += -DU2F_TEST
host-is_enabled_error: TEST_SCRIPT=is_enabled_error.sh
is_enabled_error-y=is_enabled_error.o.cmd