From 042f99af11085a1979ca5b2670b11672ad934654 Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Wed, 29 Apr 2020 11:44:17 -0400 Subject: The new keywrap core now talks directly to the MKM, so there are some API changes. --- projects/hsm/mgmt-masterkey.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'projects/hsm/mgmt-masterkey.c') diff --git a/projects/hsm/mgmt-masterkey.c b/projects/hsm/mgmt-masterkey.c index e63e0e0..97e62a0 100644 --- a/projects/hsm/mgmt-masterkey.c +++ b/projects/hsm/mgmt-masterkey.c @@ -70,7 +70,7 @@ static int cmd_masterkey_status(struct cli_def *cli, const char *command, char * cli_print(cli, "Status of master key:\n"); - status = hal_mkm_volatile_read(NULL, 0); + status = hal_keywrap_mkm_status(NULL); cli_print(cli, " volatile: %s / %s", _status2str(status), hal_error_string(status)); status = hal_mkm_flash_read(NULL, 0); @@ -170,11 +170,16 @@ static int _masterkey_set(struct cli_def *cli, char *argv[], int argc, return CLI_OK; } +static hal_error_t _mkm_volatile_write(const uint8_t *kek, const size_t kek_len) +{ + return hal_keywrap_mkm_write(NULL, kek, kek_len); +} + static int cmd_masterkey_set(struct cli_def *cli, const char *command, char *argv[], int argc) { command = command; - return _masterkey_set(cli, argv, argc, "volatile", hal_mkm_volatile_write); + return _masterkey_set(cli, argv, argc, "volatile", _mkm_volatile_write); } static int cmd_masterkey_erase(struct cli_def *cli, const char *command, char *argv[], int argc) @@ -185,7 +190,7 @@ static int cmd_masterkey_erase(struct cli_def *cli, const char *command, char *a argv = argv; argc = argc; - if ((err = hal_mkm_volatile_erase(KEK_LENGTH)) == LIBHAL_OK) { + if ((err = hal_keywrap_mkm_erase(NULL, KEK_LENGTH)) == LIBHAL_OK) { cli_print(cli, "Erased master key from volatile memory"); } else { cli_print(cli, "Failed erasing master key from volatile memory: %s", hal_error_string(err)); -- cgit v1.2.3