diff options
| -rw-r--r-- | projects/cli-test/Makefile | 2 | ||||
| -rw-r--r-- | projects/cli-test/cli-test.c | 2 | ||||
| -rw-r--r-- | projects/cli-test/mgmt-set.c | 146 | ||||
| -rw-r--r-- | projects/cli-test/mgmt-set.h | 43 | ||||
| -rw-r--r-- | projects/cli-test/mgmt-show.c | 17 | ||||
| -rw-r--r-- | projects/cli-test/mgmt-show.h | 2 |
6 files changed, 206 insertions, 6 deletions
diff --git a/projects/cli-test/Makefile b/projects/cli-test/Makefile index 16de9f3..3e1f225 100644 --- a/projects/cli-test/Makefile +++ b/projects/cli-test/Makefile @@ -1,6 +1,6 @@ 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 +OBJS = crc32.o test_sdram.o mgmt-cli.o mgmt-dfu.c mgmt-fpga.c mgmt-misc.c mgmt-show.c mgmt-test.c mgmt-set.c CFLAGS += -I$(LIBCLI_DIR) -I$(LIBHAL_DIR) LIBS += $(LIBCLI_DIR)/libcli.a diff --git a/projects/cli-test/cli-test.c b/projects/cli-test/cli-test.c index a52dbec..b89e7d4 100644 --- a/projects/cli-test/cli-test.c +++ b/projects/cli-test/cli-test.c @@ -40,6 +40,7 @@ #include "mgmt-misc.h" #include "mgmt-show.h" #include "mgmt-test.h" +#include "mgmt-set.h" #include <string.h> @@ -94,6 +95,7 @@ main() configure_cli_test(&cli); configure_cli_misc(&cli); configure_cli_dfu(&cli); + configure_cli_set(&cli); led_off(LED_RED); led_on(LED_GREEN); diff --git a/projects/cli-test/mgmt-set.c b/projects/cli-test/mgmt-set.c new file mode 100644 index 0000000..a9108e7 --- /dev/null +++ b/projects/cli-test/mgmt-set.c @@ -0,0 +1,146 @@ +/* + * mgmt-set.c + * ----------- + * CLI 'set' commands. + * + * Copyright (c) 2016, NORDUnet A/S All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the NORDUnet nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * 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" +#include "stm-uart.h" + +#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> + + +int cmd_set_keystore_pin(struct cli_def *cli, const char *command, char *argv[], int argc) +{ + const hal_ks_keydb_t *db; + hal_user_t user; + hal_ks_pin_t pin; + hal_error_t status; + + db = hal_ks_get_keydb(); + + if (db == NULL) { + cli_print(cli, "Could not get a keydb from libhal"); + return CLI_OK; + } + + if (argc != 3) { + cli_print(cli, "Wrong number of arguments (%i).", argc); + cli_print(cli, "Syntax: set keystore pin <user|so|wheel> <iterations> <pin>"); + return CLI_ERROR; + } + + user = HAL_USER_NONE; + if (strcmp(argv[0], "user") == 0) user = HAL_USER_NORMAL; + if (strcmp(argv[0], "so") == 0) user = HAL_USER_SO; + if (strcmp(argv[0], "wheel") == 0) user = HAL_USER_WHEEL; + if (user == HAL_USER_NONE) { + cli_print(cli, "First argument must be 'user', 'so' or 'wheel' - not '%s'", argv[0]); + return CLI_ERROR; + } + + pin.iterations = strtol(argv[1], NULL, 0); + + /* We don't actually PBKDF2 the given PIN yet, just testing */ + strncpy((char *) pin.pin, argv[2], sizeof(pin.pin)); + + if ((status = hal_ks_set_pin(user, &pin)) != LIBHAL_OK) { + cli_print(cli, "Failed setting PIN: %s", hal_error_string(status)); + return CLI_ERROR; + } + + return CLI_OK; +} + +int cmd_set_keystore_key(struct cli_def *cli, const char *command, char *argv[], int argc) +{ + const hal_ks_keydb_t *db; + hal_error_t status; + int hint; + + db = hal_ks_get_keydb(); + + if (db == NULL) { + cli_print(cli, "Could not get a keydb from libhal"); + return CLI_OK; + } + + if (argc != 2) { + cli_print(cli, "Wrong number of arguments (%i).", argc); + cli_print(cli, "Syntax: set keystore key <name> <der>"); + return CLI_ERROR; + } + + hint = 0; + if ((status = hal_ks_store(HAL_KEY_TYPE_EC_PUBLIC, + HAL_CURVE_NONE, + 0, + (uint8_t *) argv[0], strlen(argv[0]), + (uint8_t *) argv[1], strlen(argv[1]), + &hint)) != LIBHAL_OK) { + + cli_print(cli, "Failed storing key: %s", hal_error_string(status)); + return CLI_ERROR; + } + + cli_print(cli, "Stored key %i", hint); + + return CLI_OK; +} + +void configure_cli_set(struct cli_def *cli) +{ + /* set */ + cli_command_root(set); + /* set keystore */ + cli_command_branch(set, keystore); + + /* set keystore pin */ + cli_command_node(set_keystore, pin, "Set either 'wheel', 'user' or 'so' PIN"); + + /* set keystore key */ + cli_command_node(set_keystore, key, "Set a key"); +} diff --git a/projects/cli-test/mgmt-set.h b/projects/cli-test/mgmt-set.h new file mode 100644 index 0000000..1772d5b --- /dev/null +++ b/projects/cli-test/mgmt-set.h @@ -0,0 +1,43 @@ +/* + * mgmt-set.h + * ---------- + * Management CLI 'set' functions. + * + * Copyright (c) 2016, NORDUnet A/S All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the NORDUnet nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __STM32_CLI_MGMT_SET_H +#define __STM32_CLI_MGMT_SET_H + +#include "stm-init.h" +#include <libcli.h> + +extern void configure_cli_set(struct cli_def *cli); + +#endif /* __STM32_CLI_MGMT_SET_H */ diff --git a/projects/cli-test/mgmt-show.c b/projects/cli-test/mgmt-show.c index ba2a327..12ea339 100644 --- a/projects/cli-test/mgmt-show.c +++ b/projects/cli-test/mgmt-show.c @@ -129,21 +129,30 @@ int cmd_show_keystore_keys(struct cli_def *cli, const char *command, char *argv[ { 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)); + cli_print(cli, "Sizeof db->keys is %i, sizeof one key is %i\n", 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); + if (! db->keys[i].in_use) { + cli_print(cli, "Key %i, not in use", i); + } else { + cli_print(cli, "Key %i, in use 0x%x, name '%s' der '%s'", + i, db->keys[i].in_use, db->keys[i].name, db->keys[i].der); + } } + cli_print(cli, "\nPins:"); + cli_print(cli, "Wheel iterations: 0x%lx", db->wheel_pin.iterations); + cli_print(cli, "SO iterations: 0x%lx", db->so_pin.iterations); + cli_print(cli, "User iterations: 0x%lx", db->user_pin.iterations); + cli_print(cli, "\n"); + return CLI_OK; } diff --git a/projects/cli-test/mgmt-show.h b/projects/cli-test/mgmt-show.h index 0d7ba3a..e459acb 100644 --- a/projects/cli-test/mgmt-show.h +++ b/projects/cli-test/mgmt-show.h @@ -1,5 +1,5 @@ /* - * mgmt-misc.h + * mgmt-show.h * ----------- * Management CLI 'show' functions. * |