summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Norvez <norvez@chromium.org>2018-11-04 17:32:44 -0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2019-05-07 13:01:52 +0000
commit5a7e4760b06d0ecfe4ae0d6e225e24eea57f472a (patch)
treee2d7b776dc5d3d513f037cd81a7e2a0d563eca77
parent90daa838b97dd7cef882341ca9e7bded1e2f6d5a (diff)
downloadchrome-ec-5a7e4760b06d0ecfe4ae0d6e225e24eea57f472a.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/chromiumos/platform/ec/+/1557841 Tested-by: Yong Hong <yhong@google.com> Commit-Queue: Yong Hong <yhong@google.com>
-rw-r--r--include/ec_commands.h3
-rw-r--r--util/ectool.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/ec_commands.h b/include/ec_commands.h
index fa7a80f1a0..d65eb8760f 100644
--- a/include/ec_commands.h
+++ b/include/ec_commands.h
@@ -5052,6 +5052,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 696e431330..8647a4393a 100644
--- a/util/ectool.c
+++ b/util/ectool.c
@@ -1481,7 +1481,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);