diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2018-03-30 21:23:52 -0700 |
|---|---|---|
| committer | Vadim Bendebury <vbendeb@chromium.org> | 2019-09-21 13:46:44 -0700 |
| commit | 8ffa15ec1cc539b0c290f372c240edb7bc93dfc7 (patch) | |
| tree | 49cc5c2e046edc4d3d3cd2bae67b441b2cfeb453 /test | |
| parent | b2d4e7fea8e0607c3daae1442c8fda61935c465b (diff) | |
| download | chrome-ec-8ffa15ec1cc539b0c290f372c240edb7bc93dfc7.tar.gz | |
cr50: use run time generated public RMA key definition
Use RMA public key definition generated based on the binary blob
containing the key and key ID.
Key generation is controlled by the make file in common/, but actual
key blob comes from the board directory.
The structure holding the key and key ID is being modified to allow
initialization using a flat array.
No more need in defining CONFIG_RMA_AUTH_SERVER_PUBLIC_KEY and
CONFIG_RMA_AUTH_SERVER_KEY_ID.
Conflicts:
common/build.mk
board/cr50/board.h
BRANCH=cr50, cr50-mp
BUG=b:73296144, b:74100307
TEST='make buildall' still succeeds.
test RMA server generated authentication codes are accepted when
unlocking RMA.
Change-Id: I8ade94de6eb69b3e49bc5b948dbac20e59962acf
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/990783
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
(cherry picked from commit f2eac533dcad117e4f631f00d27977ca611dc497)
Reviewed-on: https://chromium-review.googlesource.com/1015612
(cherry picked from commit 10caf0ecd37ebd674c38d5a91780a1efce8f7e90)
Reviewed-on: https://chromium-review.googlesource.com/1080308
(cherry picked from commit 8bdf8acea69b53340c16ab48755429a9d98b820c)
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_config.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/test_config.h b/test/test_config.h index 4175ed0a2d..4f718919de 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -61,11 +61,14 @@ #ifdef TEST_RMA_AUTH /* Test server public and private keys */ -#define RMA_TEST_SERVER_PUBLIC_KEY { \ +#define RMA_KEY_BLOB { \ 0x03, 0xae, 0x2d, 0x2c, 0x06, 0x23, 0xe0, 0x73, \ 0x0d, 0xd3, 0xb7, 0x92, 0xac, 0x54, 0xc5, 0xfd, \ 0x7e, 0x9c, 0xf0, 0xa8, 0xeb, 0x7e, 0x2a, 0xb5, \ - 0xdb, 0xf4, 0x79, 0x5f, 0x8a, 0x0f, 0x28, 0x3f} + 0xdb, 0xf4, 0x79, 0x5f, 0x8a, 0x0f, 0x28, 0x3f, \ + 0x10 \ + } + #define RMA_TEST_SERVER_PRIVATE_KEY { \ 0x47, 0x3b, 0xa5, 0xdb, 0xc4, 0xbb, 0xd6, 0x77, \ 0x20, 0xbd, 0xd8, 0xbd, 0xc8, 0x7a, 0xbb, 0x07, \ @@ -76,8 +79,6 @@ #define CONFIG_BASE32 #define CONFIG_CURVE25519 #define CONFIG_RMA_AUTH -#define CONFIG_RMA_AUTH_SERVER_PUBLIC_KEY RMA_TEST_SERVER_PUBLIC_KEY -#define CONFIG_RMA_AUTH_SERVER_KEY_ID RMA_TEST_SERVER_KEY_ID #define CONFIG_RNG #define CONFIG_SHA256 #define CC_EXTENSION CC_COMMAND |