From e6bdf57820121b6eac9f35c8ef53a4e7a76205e1 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sun, 20 May 2018 18:18:40 -0400 Subject: Better hal_core_alloc() semantics, assert() and printf() cleanup. Various fixes extracted from the abandoned(-for-now?) reuse-cores branch, principally: * Change hal_core_alloc*() to support core reuse and to pick the least-recently-used core of a particular type otherwise; * Replace assert() and printf() calls with hal_assert() and hal_log(), respectively. assert() is particularly useless on the HSM, since it sends its error message into hyperspace then hangs the HSM. --- hal_internal.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'hal_internal.h') diff --git a/hal_internal.h b/hal_internal.h index 922562a..742b67b 100644 --- a/hal_internal.h +++ b/hal_internal.h @@ -47,6 +47,19 @@ * should be looking at this file. */ +/* + * Assertions, using our logger rather than printf() and assuming a + * hal_error_t return value. + */ + +#define hal_assert(_whatever_) \ + do { \ + if (!(_whatever_)) { \ + hal_log(HAL_LOG_ERROR, "Assertion failed: %s", #_whatever_); \ + return HAL_ERROR_ASSERTION_FAILED; \ + } \ + } while (0) + /* * htonl is not available in arm-none-eabi headers or libc. */ @@ -513,15 +526,8 @@ typedef struct { int hint; /* - * This might be where we'd stash a (hal_core_t *) pointing to a - * core which has already been loaded with the key, if we were - * trying to be clever about using multiple signing cores. Moot - * point (ie, no way we could possibly test such a thing) as long as - * the FPGA is too small to hold more than one modexp core and ECDSA - * is entirely software, so skip it for now, but the implied - * semantics are interesting: a pkey handle starts to resemble an - * initialized signing core, and once all the cores are in use, one - * can't load another key without closing an existing pkey handle. + * This might be where we'd stash one or more (hal_core_t *) + * pointing to cores which have already been loaded with the key. */ } hal_pkey_slot_t; -- cgit v1.2.3