diff options
| author | Nicolas Boichat <drinkcat@google.com> | 2017-06-13 10:30:32 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-06-15 09:37:57 -0700 |
| commit | a9364ca5d413d9946cfe2ee0c5ee9b954cd4adc5 (patch) | |
| tree | 524bee03e41266e8d82bda0923f2d34ae646dbdb | |
| parent | 77e7913b696e16b7fae72e5210f940f8213ff1b5 (diff) | |
| download | chrome-ec-a9364ca5d413d9946cfe2ee0c5ee9b954cd4adc5.tar.gz | |
hammer: Add support for base pairing
x25519 requires quite a bit more stack size (1696/2048), so
increase its size.
BRANCH=none
BUG=b:38486828
TEST=Flash hammer, ./usb_updater2 -c always reports the same
device public key, and authenticator is correct.
Change-Id: I51dff9f10167d654561ef7f199b9b9206511b7e9
Reviewed-on: https://chromium-review.googlesource.com/532476
Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Mattias Nissler <mnissler@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | board/hammer/board.h | 7 | ||||
| -rw-r--r-- | board/hammer/ec.tasklist | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/board/hammer/board.h b/board/hammer/board.h index ac87d9b2a2..2ccb3aca23 100644 --- a/board/hammer/board.h +++ b/board/hammer/board.h @@ -177,15 +177,20 @@ #define CONFIG_TOUCHPAD_I2C_PORT 0 #define CONFIG_TOUCHPAD_I2C_ADDR (0x15 << 1) +#define CONFIG_CURVE25519 + +#define CONFIG_USB_PAIRING + #else /* SECTION_IS_RO */ /* Sign and switch to RW partition on boot. */ #define CONFIG_RWSIG #define CONFIG_RSA -#define CONFIG_SHA256 #define CONFIG_RSA_KEY_SIZE 3072 #define CONFIG_RSA_EXPONENT_3 #endif +#define CONFIG_SHA256 + #define CONFIG_RWSIG_TYPE_RWSIG /* diff --git a/board/hammer/ec.tasklist b/board/hammer/ec.tasklist index 81dcca2136..06ff3e0c1d 100644 --- a/board/hammer/ec.tasklist +++ b/board/hammer/ec.tasklist @@ -18,7 +18,7 @@ */ #define CONFIG_TASK_LIST \ TASK_ALWAYS_RO(RWSIG, rwsig_task, NULL, 1024) \ - TASK_ALWAYS (HOOKS, hook_task, NULL, 1280) \ + TASK_ALWAYS (HOOKS, hook_task, NULL, 2048) \ TASK_ALWAYS_RW(TOUCHPAD, elan_tp_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS (CONSOLE, console_task, NULL, 1024) \ TASK_NOTEST_RW(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) |