diff options
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/cli-test/Makefile | 3 | ||||
| -rw-r--r-- | projects/cli-test/mgmt-show.c | 36 |
2 files changed, 37 insertions, 2 deletions
diff --git a/projects/cli-test/Makefile b/projects/cli-test/Makefile index acf2720..16de9f3 100644 --- a/projects/cli-test/Makefile +++ b/projects/cli-test/Makefile @@ -2,8 +2,9 @@ TEST = cli-test OBJS = crc32.o test_sdram.o mgmt-cli.o mgmt-dfu.c mgmt-fpga.c mgmt-misc.c mgmt-show.c mgmt-test.c -CFLAGS += -I$(LIBCLI_DIR) +CFLAGS += -I$(LIBCLI_DIR) -I$(LIBHAL_DIR) LIBS += $(LIBCLI_DIR)/libcli.a +LIBS += $(LIBHAL_DIR)/libhal.a all: $(TEST:=.elf) diff --git a/projects/cli-test/mgmt-show.c b/projects/cli-test/mgmt-show.c index 3ae196e..ba2a327 100644 --- a/projects/cli-test/mgmt-show.c +++ b/projects/cli-test/mgmt-show.c @@ -32,6 +32,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#define HAL_OK CMSIS_HAL_OK + #include "stm-init.h" #include "stm-keystore.h" #include "stm-fpgacfg.h" @@ -40,6 +42,15 @@ #include "mgmt-cli.h" #include "mgmt-show.h" +/* Rename both CMSIS HAL_OK and libhal HAL_OK to disambiguate */ +#undef HAL_OK +#define LIBHAL_OK HAL_OK +#include "hal.h" + +#define HAL_STATIC_PKEY_STATE_BLOCKS 6 +#include "hal_internal.h" +#undef HAL_OK + #include <string.h> @@ -104,7 +115,7 @@ int cmd_show_keystore_data(struct cli_def *cli, const char *command, char *argv[ } } else { cli_print(cli, "Erasing first sector since all the first 8 bytes are tombstones"); - if ((i = keystore_erase_sectors(1)) != 1) { + if ((i = keystore_erase_sectors(1, 1)) != 1) { cli_print(cli, "Failed erasing the first sector: %li", i); return CLI_ERROR; } @@ -114,6 +125,28 @@ int cmd_show_keystore_data(struct cli_def *cli, const char *command, char *argv[ return CLI_OK; } +int cmd_show_keystore_keys(struct cli_def *cli, const char *command, char *argv[], int argc) +{ + const hal_ks_keydb_t *db; + + cli_print(cli, "Get keydb"); + db = hal_ks_get_keydb(); + + if (db == NULL) { + cli_print(cli, "Could not get a keydb from libhal"); + return CLI_OK; + } + cli_print(cli, "Got keydb"); + + cli_print(cli, "Sizeof db->keys is %i, sizeof one key is %i", sizeof(db->keys), sizeof(*db->keys)); + + for (int i = 0; i < sizeof(db->keys)/sizeof(*db->keys); i++) { + cli_print(cli, "key %i, in use 0x%x, ks_internal %i", i, db->keys[i].in_use, db->keys[i].ks_internal); + } + + return CLI_OK; +} + void configure_cli_show(struct cli_def *cli) { /* show */ @@ -130,4 +163,5 @@ void configure_cli_show(struct cli_def *cli) /* show keystore status*/ cli_command_node(show_keystore, status, "Show status of the keystore memory"); cli_command_node(show_keystore, data, "Show the first page of the keystore memory"); + cli_command_node(show_keystore, keys, "List the keys in the keystore database"); } |