diff options
| author | Andrey Pronin <apronin@chromium.org> | 2019-08-21 10:29:21 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-24 23:31:04 +0000 |
| commit | 354cbffc2d747c9af788c250d59f0b128440d323 (patch) | |
| tree | d6cd5b74aa419bb065c98f02b26d736da40ed2bb | |
| parent | cb7990d561be1879384ec628151c9bc3a3f854fc (diff) | |
| download | chrome-ec-354cbffc2d747c9af788c250d59f0b128440d323.tar.gz | |
cr50: fix conflict in vendor_cmd_cc enum
After CL:1740075 and CL:1748846 we had a duplicate value for two
different vendor commands in tpm_vendor_cmd.h:
VENDOR_CC_ENDORSEMENT_SEED = 48
VENDOR_CC_U2F_MODE = 48
This CL fixes the issue.
BRANCH=none
BUG=b:139809333
TEST=none
Change-Id: Ic593e138c9126eb2a7e97b2e12c2daa890787d8c
Signed-off-by: Andrey Pronin <apronin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1763303
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Commit-Queue: Louis Collard <louiscollard@chromium.org>
(cherry picked from commit 4ad4225c1cfdf015ea82158aea7eb44937382460)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2243754
Tested-by: Mary Ruthven <mruthven@chromium.org>
Commit-Queue: Mary Ruthven <mruthven@chromium.org>
(cherry picked from commit 31bb714b1a7b48530f1b7fa4b520c304946a3585)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2261502
| -rw-r--r-- | include/tpm_vendor_cmds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/tpm_vendor_cmds.h b/include/tpm_vendor_cmds.h index e669a89a4b..20336f637d 100644 --- a/include/tpm_vendor_cmds.h +++ b/include/tpm_vendor_cmds.h @@ -133,7 +133,7 @@ enum vendor_cmd_cc { VENDOR_CC_FLOG_TIMESTAMP = 47, - VENDOR_CC_U2F_MODE = 48, + VENDOR_CC_U2F_MODE = 49, /* * HMAC-SHA256 DRBG invocation for ACVP tests |