diff options
| author | Firas Sammoura <fsammoura@google.com> | 2022-09-13 15:51:35 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-14 18:56:30 +0000 |
| commit | 25fd82d3b15aefd9d137175a6df2eefaa1e83fa5 (patch) | |
| tree | 61e305d637e68527a0e863c68d7642dbeda08c56 | |
| parent | 6572e7d68bcebca5e9717f43111d68f6a3e35d14 (diff) | |
| download | chrome-ec-25fd82d3b15aefd9d137175a6df2eefaa1e83fa5.tar.gz | |
mock: Fix format for 2-dimensional arrays
Define default_fake_fp_positive_match_salt and
trivial_fp_positive_match_salt explicitly as 2-dimensional arrays with
dimensions FP_MAX_FINGER_COUNT and FP_POSITIVE_MATCH_SALT_BYTES. Include
driver/fingerprint/fpsensor.h to define FP_MAX_FINGER_COUNT.
BRANCH=None
BUG=b:242720387
TEST=make run-fpsensor_state
TEST=make runhosttests
Signed-off-by: Firas Sammoura <fsammoura@google.com>
Change-Id: Iaae2280179e99bd5098928976727aa9b3cca9954
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3893046
Reviewed-by: Craig Hesling <hesling@chromium.org>
| -rw-r--r-- | common/mock/fpsensor_state_mock.c | 53 | ||||
| -rw-r--r-- | include/mock/fpsensor_state_mock.h | 2 |
2 files changed, 34 insertions, 21 deletions
diff --git a/common/mock/fpsensor_state_mock.c b/common/mock/fpsensor_state_mock.c index 1c931bc24d..cbeb29ae3c 100644 --- a/common/mock/fpsensor_state_mock.c +++ b/common/mock/fpsensor_state_mock.c @@ -7,6 +7,7 @@ #include <string.h> #include "common.h" +#include "driver/fingerprint/fpsensor.h" #include "ec_commands.h" #include "test_util.h" @@ -21,27 +22,37 @@ const uint8_t default_fake_tpm_seed[] = { }; BUILD_ASSERT(sizeof(default_fake_tpm_seed) == FP_CONTEXT_TPM_BYTES); -const uint8_t default_fake_fp_positive_match_salt[] = { - 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, 0x04, 0x1d, 0x46, 0x3a, - 0x5f, 0x08, 0xee, 0xcb, 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, - 0x04, 0x1d, 0x46, 0x3a, 0x5f, 0x08, 0xee, 0xcb, 0x04, 0x1f, 0x5a, 0xac, - 0x5f, 0x79, 0x10, 0xaf, 0x04, 0x1d, 0x46, 0x3a, 0x5f, 0x08, 0xee, 0xcb, - 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, 0x04, 0x1d, 0x46, 0x3a, - 0x5f, 0x08, 0xee, 0xcb, 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, - 0x04, 0x1d, 0x46, 0x3a, 0x5f, 0x08, 0xee, 0xcb -}; -BUILD_ASSERT(sizeof(default_fake_fp_positive_match_salt) == 80); - -const uint8_t trivial_fp_positive_match_salt[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; -BUILD_ASSERT(sizeof(trivial_fp_positive_match_salt) == 80); +const uint8_t default_fake_fp_positive_match_salt + [FP_MAX_FINGER_COUNT][FP_POSITIVE_MATCH_SALT_BYTES] = { + { 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, 0x04, 0x1d, + 0x46, 0x3a, 0x5f, 0x08, 0xee, 0xcb }, + { 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, 0x04, 0x1d, + 0x46, 0x3a, 0x5f, 0x08, 0xee, 0xcb }, + { 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, 0x04, 0x1d, + 0x46, 0x3a, 0x5f, 0x08, 0xee, 0xcb }, + { 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, 0x04, 0x1d, + 0x46, 0x3a, 0x5f, 0x08, 0xee, 0xcb }, + { 0x04, 0x1f, 0x5a, 0xac, 0x5f, 0x79, 0x10, 0xaf, 0x04, 0x1d, + 0x46, 0x3a, 0x5f, 0x08, 0xee, 0xcb } + }; +BUILD_ASSERT(sizeof(default_fake_fp_positive_match_salt) == + FP_MAX_FINGER_COUNT * FP_POSITIVE_MATCH_SALT_BYTES); + +const uint8_t trivial_fp_positive_match_salt + [FP_MAX_FINGER_COUNT][FP_POSITIVE_MATCH_SALT_BYTES] = { + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } + }; +BUILD_ASSERT(sizeof(trivial_fp_positive_match_salt) == + FP_MAX_FINGER_COUNT * FP_POSITIVE_MATCH_SALT_BYTES); int fpsensor_state_mock_set_tpm_seed( const uint8_t tpm_seed[FP_CONTEXT_TPM_BYTES]) diff --git a/include/mock/fpsensor_state_mock.h b/include/mock/fpsensor_state_mock.h index 34d6a8d3c7..32450e3cc0 100644 --- a/include/mock/fpsensor_state_mock.h +++ b/include/mock/fpsensor_state_mock.h @@ -8,6 +8,8 @@ #include <stdbool.h> #include <stdint.h> + +#include "driver/fingerprint/fpsensor.h" #include "ec_commands.h" extern const uint8_t default_fake_tpm_seed[FP_CONTEXT_TPM_BYTES]; |