diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2023-03-16 22:19:19 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-03-16 22:53:03 +0000 |
| commit | 8c2d93d80233b014078ac01e7d93ea89089b950b (patch) | |
| tree | 5b7f4ee778724e88843a21b6db8feb371193ca54 | |
| parent | f9a09730386ddb3a770569b01efebe20b17c0619 (diff) | |
| download | chrome-ec-8c2d93d80233b014078ac01e7d93ea89089b950b.tar.gz | |
Revert "cr50: Use platform/pinweaver"
This reverts commit ed10ce4730d37a4ae7eab60ad70257720399f289.
Reason for revert: Causes building chromeos-cr50-dev to fail
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
Change-Id: Ib60f090c50b1e34635ce2e1f3537f7eb0c95490e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4348103
Tested-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Matt Vertescher <mvertescher@google.com>
Commit-Queue: Mary Ruthven <mruthven@chromium.org>
Auto-Submit: Mary Ruthven <mruthven@chromium.org>
| -rw-r--r-- | board/cr50/board.h | 2 | ||||
| -rwxr-xr-x | util/getversion.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/board/cr50/board.h b/board/cr50/board.h index 87ae4cd9a1..7729d79931 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_PLATFORM_PINWEAVER +#define CONFIG_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 ea73b7d054..f17e4c3751 100755 --- a/util/getversion.sh +++ b/util/getversion.sh @@ -99,7 +99,6 @@ main() { case "${BOARD}" in (cr50) dir_list+=( ../../third_party/tpm2 ) - dir_list+=( ../pinweaver ) ;; (*_fp) dir_list+=( ./private ) |