diff options
| author | Vadim Sukhomlinov <sukhomlinov@google.com> | 2021-09-08 12:12:51 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-10 19:23:53 +0000 |
| commit | 577a2900bd7628f010a514b81e1eb645e03ceda7 (patch) | |
| tree | fe25ab258d81369bddbbbf6e61348417663f8a47 | |
| parent | 77d80437e4fc4c8a49f330471fb32a6e78749922 (diff) | |
| download | chrome-ec-577a2900bd7628f010a514b81e1eb645e03ceda7.tar.gz | |
cr50: consolidate FIPS module sources under board/cr50/dcrypto
To simplify identification of FIPS module boundary, move all sources
into same place.
BUG=b:134594373
TEST=make buildall -j
Signed-off-by: Vadim Sukhomlinov <sukhomlinov@google.com>
Change-Id: I6acd12d12c00a3362041914bd515534f72a08ab2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3150057
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Tested-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Auto-Submit: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
| -rw-r--r-- | board/cr50/build.mk | 6 | ||||
| -rw-r--r-- | board/cr50/dcrypto/fips.c (renamed from board/cr50/fips.c) | 0 | ||||
| -rw-r--r-- | board/cr50/dcrypto/fips.h (renamed from board/cr50/fips.h) | 0 | ||||
| -rw-r--r-- | board/cr50/dcrypto/fips_rand.c (renamed from board/cr50/fips_rand.c) | 0 | ||||
| -rw-r--r-- | board/cr50/dcrypto/fips_rand.h (renamed from board/cr50/fips_rand.h) | 0 | ||||
| -rw-r--r-- | board/cr50/dcrypto/u2f.c (renamed from board/cr50/u2f.c) | 0 | ||||
| -rw-r--r-- | board/cr50/dcrypto/u2f_impl.h (renamed from include/u2f_impl.h) | 0 | ||||
| -rw-r--r-- | chip/host/build.mk | 2 | ||||
| -rw-r--r-- | test/build.mk | 2 |
9 files changed, 5 insertions, 5 deletions
diff --git a/board/cr50/build.mk b/board/cr50/build.mk index f9401b9527..4576e30c0e 100644 --- a/board/cr50/build.mk +++ b/board/cr50/build.mk @@ -81,9 +81,9 @@ board-${CONFIG_USB_I2C} += usb_i2c.o board-y += recovery_button.o fips-y= -fips-y += fips.o -fips-y += fips_rand.o -fips-$(CONFIG_U2F) += u2f.o +fips-y += dcrypto/fips.o +fips-y += dcrypto/fips_rand.o +fips-$(CONFIG_U2F) += dcrypto/u2f.o fips-${CONFIG_DCRYPTO_BOARD} += dcrypto/aes.o fips-${CONFIG_DCRYPTO_BOARD} += dcrypto/app_cipher.o fips-${CONFIG_DCRYPTO_BOARD} += dcrypto/app_key.o diff --git a/board/cr50/fips.c b/board/cr50/dcrypto/fips.c index 349117d49b..349117d49b 100644 --- a/board/cr50/fips.c +++ b/board/cr50/dcrypto/fips.c diff --git a/board/cr50/fips.h b/board/cr50/dcrypto/fips.h index 52d8ec68c6..52d8ec68c6 100644 --- a/board/cr50/fips.h +++ b/board/cr50/dcrypto/fips.h diff --git a/board/cr50/fips_rand.c b/board/cr50/dcrypto/fips_rand.c index 926af66f96..926af66f96 100644 --- a/board/cr50/fips_rand.c +++ b/board/cr50/dcrypto/fips_rand.c diff --git a/board/cr50/fips_rand.h b/board/cr50/dcrypto/fips_rand.h index dca1f473bf..dca1f473bf 100644 --- a/board/cr50/fips_rand.h +++ b/board/cr50/dcrypto/fips_rand.h diff --git a/board/cr50/u2f.c b/board/cr50/dcrypto/u2f.c index 9f987fbd64..9f987fbd64 100644 --- a/board/cr50/u2f.c +++ b/board/cr50/dcrypto/u2f.c diff --git a/include/u2f_impl.h b/board/cr50/dcrypto/u2f_impl.h index 7f0f10ef36..7f0f10ef36 100644 --- a/include/u2f_impl.h +++ b/board/cr50/dcrypto/u2f_impl.h diff --git a/chip/host/build.mk b/chip/host/build.mk index fd7f75f3c0..6cdd9807d4 100644 --- a/chip/host/build.mk +++ b/chip/host/build.mk @@ -15,7 +15,7 @@ chip-$(HAS_TASK_KEYSCAN)+=keyboard_raw.o endif ifeq ($(CONFIG_DCRYPTO),y) -CPPFLAGS += -I$(abspath ./board/cr50) +CPPFLAGS += -I$(abspath ./board/cr50/dcrypto) dirs-y += board/cr50/dcrypto LDFLAGS_EXTRA += -lcrypto endif diff --git a/test/build.mk b/test/build.mk index 8efc82f5f0..84e3b9f2f1 100644 --- a/test/build.mk +++ b/test/build.mk @@ -95,7 +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 +u2f-y+=../board/cr50/dcrypto/u2f.o uptime-y=uptime.o utils-y=utils.o utils_str-y=utils_str.o |