summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2023-03-03 07:59:03 -0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-03-29 03:48:19 +0000
commitd0b376719140b43f1fc45ba327edc49f8daf75c7 (patch)
tree666dface3c0bca7dc75de69e5478d0349ed09ed5
parent521e07ce947f4cb20af6a5c30ff7ad6efbfeafcb (diff)
downloadchrome-ec-d0b376719140b43f1fc45ba327edc49f8daf75c7.tar.gz
Reland "cr50: Use platform/pinweaver"
This is a reland of commit ed10ce4730d37a4ae7eab60ad70257720399f289 Original change's description: > cr50: Use platform/pinweaver > > Toggle the CONFIG_PLATFORM_PINWEAVER build flag, to build pinweaver with > the platform/pinweaver implementation instead of the cr50 > implementation. > > BUG=b:262040869 > TEST=make board=cr50 -j > TEST=(DUT) Use cryptohome CLI to create a user with a PIN. > TEST=(DUT) Make 2 fail attempts on that PIN. > TEST=(DUT) Update cr50 to the image including this CL. > TEST=(DUT) Test leaf properties are correct: 3 more fail attempts locks > the PIN, password auth resets the PIN, then PIN authentication succeeds. > TEST=tast run $DUT hwsec.PINWeaver* > > Cq-Depend: chromium:4307211 > Change-Id: I6e52566ca8ee68bb0ee71d30538fb6b8cbc4f67d > Signed-off-by: Mary Ruthven <mruthven@chromium.org> > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4311235 > Tested-by: Howard Yang <hcyang@google.com> > Reviewed-by: Andrey Pronin <apronin@chromium.org> > Commit-Queue: Howard Yang <hcyang@google.com> Bug: b:262040869 Cq-Depend: chromium:4354785 Change-Id: Ibb7ad2c1f752f7ed8678465f5b3901536314d466 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4349272 Tested-by: Howard Yang <hcyang@google.com> Reviewed-by: Andrey Pronin <apronin@chromium.org> Commit-Queue: Howard Yang <hcyang@google.com>
-rw-r--r--board/cr50/board.h2
-rwxr-xr-xutil/getversion.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/board/cr50/board.h b/board/cr50/board.h
index 7729d79931..87ae4cd9a1 100644
--- a/board/cr50/board.h
+++ b/board/cr50/board.h
@@ -566,7 +566,7 @@ enum nvmem_users {
#define CONFIG_ENABLE_H1_ALERTS
/* Enable hardware backed brute force resistance feature */
-#define CONFIG_PINWEAVER
+#define CONFIG_PLATFORM_PINWEAVER
/*
* Disabling p256 will result in RMA Auth falling back to the x25519 curve
diff --git a/util/getversion.sh b/util/getversion.sh
index f17e4c3751..ea73b7d054 100755
--- a/util/getversion.sh
+++ b/util/getversion.sh
@@ -99,6 +99,7 @@ main() {
case "${BOARD}" in
(cr50)
dir_list+=( ../../third_party/tpm2 )
+ dir_list+=( ../pinweaver )
;;
(*_fp)
dir_list+=( ./private )