From 38c4b787fa7c1f5e7fbf810cdda136621dd743b7 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Tue, 13 Sep 2016 16:37:39 -0400 Subject: Cleanup prior to rewriting ks_flash.c. Whack masterkey code to meet libhal coding standards, such as they are. Started layout of new ks_flash data structures but no changes to functions or flash usage yet. MKM initialization from flash placed under compile-time conditional with warning because it's a dangerous kludge that should go away. Started getting rid of obsolete keystore code; ks_mmap.c kept for now, until I get around to merging the useful bits into ks_volatile. --- masterkey.h | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 masterkey.h (limited to 'masterkey.h') diff --git a/masterkey.h b/masterkey.h deleted file mode 100644 index 1d5e7a5..0000000 --- a/masterkey.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * masterkey.h - * ----------- - * Code to handle the Master Key that wraps all the keys in the keystore. - * - * 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_HSM_MASTERKEY_H -#define __STM32_HSM_MASTERKEY_H - -extern hal_error_t masterkey_volatile_read(uint8_t *buf, size_t len); -extern hal_error_t masterkey_volatile_write(uint8_t *buf, size_t len); -extern hal_error_t masterkey_volatile_erase(size_t len); - -extern hal_error_t masterkey_flash_read(uint8_t *buf, size_t len); -extern hal_error_t masterkey_flash_write(uint8_t *buf, size_t len); -extern hal_error_t masterkey_flash_erase(size_t len); - -#endif /* __STM32_HSM_MASTERKEY_H */ -- cgit v1.2.3