diff options
| author | Nicolas Norvez <norvez@chromium.org> | 2018-11-04 17:32:44 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-12-08 02:41:05 +0000 |
| commit | 1b4ecae5bb853d870acc1452d8849bb126a5d908 (patch) | |
| tree | 67dc9edbd19886c4b95c7a723e33273e9d197a1b | |
| parent | 54b8c6822f2eeef21b1860103305f2da903c129f (diff) | |
| download | chrome-ec-1b4ecae5bb853d870acc1452d8849bb126a5d908.tar.gz | |
fpsensor: Move the definition of FP_TEMPLATE_FORMAT_VERSION
Move it to ec_commands.h so it's accessible to tools.
BRANCH=nocturne
BUG=b:73337313
TEST=make BOARD=nocturne_fp -j
Change-Id: Ib7eecee599dde2d755357c2543ad860b64258f3f
Signed-off-by: Nicolas Norvez <norvez@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1316706
Reviewed-by: Prashant Malani <pmalani@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/1364324
Reviewed-by: YH Lin <yueherngl@chromium.org>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Tested-by: YH Lin <yueherngl@chromium.org>
| -rw-r--r-- | include/ec_commands.h | 3 | ||||
| -rw-r--r-- | util/ectool.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/ec_commands.h b/include/ec_commands.h index 6f5106b0a3..7d161a63eb 100644 --- a/include/ec_commands.h +++ b/include/ec_commands.h @@ -4999,6 +4999,9 @@ struct __ec_align4 ec_response_fp_info { #define FP_FRAME_GET_BUFFER_INDEX(offset) ((offset) >> FP_FRAME_INDEX_SHIFT) #define FP_FRAME_OFFSET_MASK 0x0FFFFFFF +/* Version of the format of the encrypted templates. */ +#define FP_TEMPLATE_FORMAT_VERSION 3 + /* Constants for encryption parameters */ #define FP_CONTEXT_NONCE_BYTES 12 #define FP_CONTEXT_USERID_WORDS (32 / sizeof(uint32_t)) diff --git a/util/ectool.c b/util/ectool.c index 6e8eac51f1..0b3047643a 100644 --- a/util/ectool.c +++ b/util/ectool.c @@ -1350,7 +1350,7 @@ int cmd_fp_seed(int argc, char *argv[]) return 1; } printf("Setting seed '%s'\n", seed); - p.struct_version = 3; + p.struct_version = FP_TEMPLATE_FORMAT_VERSION; memcpy(p.seed, seed, FP_CONTEXT_TPM_BYTES); rv = ec_command(EC_CMD_FP_SEED, 0, &p, sizeof(p), NULL, 0); |