diff options
| author | Rob Austein <sra@hactrn.net> | 2016-09-13 16:37:39 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-09-13 16:37:39 -0400 |
| commit | 38c4b787fa7c1f5e7fbf810cdda136621dd743b7 (patch) | |
| tree | 2d6377c6112b98aa4e76d6ae3f1c0dfa64656215 /ks_volatile.c | |
| parent | 8c3743eee739afa344139ab17d8008131555862d (diff) | |
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.
Diffstat (limited to 'ks_volatile.c')
| -rw-r--r-- | ks_volatile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ks_volatile.c b/ks_volatile.c index 3c9cba5..02bd4cc 100644 --- a/ks_volatile.c +++ b/ks_volatile.c @@ -192,7 +192,7 @@ static hal_error_t ks_store(hal_ks_t *ks, k.curve = slot->curve; k.flags = slot->flags; - if ((err = hal_get_kek(kek, &kek_len, sizeof(kek))) == HAL_OK) + if ((err = hal_mkm_get_kek(kek, &kek_len, sizeof(kek))) == HAL_OK) err = hal_aes_keywrap(NULL, kek, kek_len, der, der_len, k.der, &k.der_len); memset(kek, 0, sizeof(kek)); @@ -242,7 +242,7 @@ static hal_error_t ks_fetch(hal_ks_t *ks, *der_len = der_max; - if ((err = hal_get_kek(kek, &kek_len, sizeof(kek))) == HAL_OK) + if ((err = hal_mkm_get_kek(kek, &kek_len, sizeof(kek))) == HAL_OK) err = hal_aes_keyunwrap(NULL, kek, kek_len, k->der, k->der_len, der, der_len); memset(kek, 0, sizeof(kek)); |