diff options
| author | Rob Austein <sra@hactrn.net> | 2016-09-09 15:34:32 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-09-09 15:34:32 -0400 |
| commit | 13718c804fd2b20a50cd0fe318390c3b2d24de32 (patch) | |
| tree | b28f15b47c08c12674f8c1178e53d456506fad59 | |
| parent | b1214089088d0321142f64abf2c820da9561bba9 (diff) | |
Missed a few instances of type-based key naming in keystore drivers.
| -rw-r--r-- | ks_flash.c | 4 | ||||
| -rw-r--r-- | ks_volatile.c | 1 |
2 files changed, 2 insertions, 3 deletions
@@ -306,7 +306,7 @@ static hal_error_t ks_fetch(hal_ks_t *ks, hal_pkey_slot_t *slot, uint8_t *der, size_t *der_len, const size_t der_max) { - if (ks != &db.ks || slot == NULL || !acceptable_key_type(slot->type)) + if (ks != &db.ks || slot == NULL) return HAL_ERROR_BAD_ARGUMENTS; const hal_ks_key_t * const k = find(&slot->name); @@ -479,7 +479,7 @@ static hal_error_t ks_store(hal_ks_t *ks, static hal_error_t ks_delete(hal_ks_t *ks, const hal_pkey_slot_t * const slot) { - if (ks != &db.ks || slot == NULL || !acceptable_key_type(slot->type)) + if (ks != &db.ks || slot == NULL) return HAL_ERROR_BAD_ARGUMENTS; hal_ks_key_t *k = find(&slot->name); diff --git a/ks_volatile.c b/ks_volatile.c index d4f8ebd..4ff23fb 100644 --- a/ks_volatile.c +++ b/ks_volatile.c @@ -142,7 +142,6 @@ static hal_error_t ks_store(hal_ks_t *ks, if (!ksv->db->keys[i].in_use && loc < 0) loc = i; if (ksv->db->keys[i].in_use && - ksv->db->keys[i].type == slot->type && hal_uuid_cmp(&ksv->db->keys[i].name, &slot->name) == 0) return HAL_ERROR_KEY_NAME_IN_USE; } |