diff options
author | Tom Hughes <tomhughes@chromium.org> | 2020-01-13 13:49:56 -0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-01-14 19:50:03 +0000 |
commit | 9f168b237d868917270c4ea43f3b7e6f2673e33f (patch) | |
tree | 6c9fcd032ad6271fd64c1c5740ca36a4b3c5c61d | |
parent | a3d44f8770d37266122f7c12515ae9932713db5a (diff) | |
download | chrome-ec-9f168b237d868917270c4ea43f3b7e6f2673e33f.tar.gz |
hatch_fp/nocturne_fp: Specify RSA_KEY_SIZE in RW and RO
The rsa.h header can be included by any file, regardless of whether
CONFIG_RSA is enabled. In that case we still want RSA_KEY_SIZE and
CONFIG_RSA_EXPONENT_3 to be correct for the board.
The following boards already set CONFIG_RSA_KEY_SIZE outside of RO/RW
* kalista
* endeavour
* fizz
* puff
BRANCH=none
BUG=b:144958737
TEST=make buildall -j
TEST=diff build/<hatch_fp,nocturne_fp,hammeri,nucleo-h743zi>/ec.bin
with and without the change
=> same
Change-Id: I7e565e25b06b0d36e28ae32934b1f65b382e5b66
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1999606
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Craig Hesling <hesling@chromium.org>
-rw-r--r-- | board/hammer/board.h | 3 | ||||
-rw-r--r-- | board/hatch_fp/board.h | 5 | ||||
-rw-r--r-- | board/nocturne_fp/board.h | 5 | ||||
-rw-r--r-- | board/nucleo-h743zi/board.h | 5 |
4 files changed, 11 insertions, 7 deletions
diff --git a/board/hammer/board.h b/board/hammer/board.h index 5eca65a6f9..d1a7af0bfe 100644 --- a/board/hammer/board.h +++ b/board/hammer/board.h @@ -287,9 +287,10 @@ /* Sign and switch to RW partition on boot. */ #define CONFIG_RWSIG #define CONFIG_RSA +#endif + #define CONFIG_RSA_KEY_SIZE 3072 #define CONFIG_RSA_EXPONENT_3 -#endif #define CONFIG_SHA256 #ifdef SECTION_IS_RO diff --git a/board/hatch_fp/board.h b/board/hatch_fp/board.h index f9999a04d2..a5f1ad5725 100644 --- a/board/hatch_fp/board.h +++ b/board/hatch_fp/board.h @@ -149,10 +149,11 @@ #else /* SECTION_IS_RO */ /* RO verifies the RW partition signature */ #define CONFIG_RSA -#define CONFIG_RSA_KEY_SIZE 3072 -#define CONFIG_RSA_EXPONENT_3 #define CONFIG_RWSIG #endif + +#define CONFIG_RSA_KEY_SIZE 3072 +#define CONFIG_RSA_EXPONENT_3 #define CONFIG_RWSIG_TYPE_RWSIG /* RW does slow compute, RO does slow flash erase. */ diff --git a/board/nocturne_fp/board.h b/board/nocturne_fp/board.h index 71283db2af..f1975d582d 100644 --- a/board/nocturne_fp/board.h +++ b/board/nocturne_fp/board.h @@ -131,10 +131,11 @@ #else /* SECTION_IS_RO */ /* RO verifies the RW partition signature */ #define CONFIG_RSA -#define CONFIG_RSA_KEY_SIZE 3072 -#define CONFIG_RSA_EXPONENT_3 #define CONFIG_RWSIG #endif + +#define CONFIG_RSA_KEY_SIZE 3072 +#define CONFIG_RSA_EXPONENT_3 #define CONFIG_RWSIG_TYPE_RWSIG /* RW does slow compute, RO does slow flash erase. */ diff --git a/board/nucleo-h743zi/board.h b/board/nucleo-h743zi/board.h index 435b8a444b..3aa6b89066 100644 --- a/board/nucleo-h743zi/board.h +++ b/board/nucleo-h743zi/board.h @@ -169,11 +169,12 @@ #else /* !SECTION_IS_RW */ /* RO verifies the RW partition signature */ # define CONFIG_RSA -# define CONFIG_RSA_KEY_SIZE 3072 -# define CONFIG_RSA_EXPONENT_3 # define CONFIG_RWSIG #endif /* SECTION_IS_RW */ +#define CONFIG_RSA_KEY_SIZE 3072 +#define CONFIG_RSA_EXPONENT_3 + /* * We do not use any "locally" generated entropy: this is normally used * to add local entropy when the main source of entropy is remote. |