diff options
| -rw-r--r-- | ks_flash.c | 9 | ||||
| -rw-r--r-- | ks_volatile.c | 12 |
2 files changed, 12 insertions, 9 deletions
@@ -1097,17 +1097,16 @@ static hal_error_t ks_list(hal_ks_t *ks, if (ks != &db.ks || result == NULL || result_len == NULL) return HAL_ERROR_BAD_ARGUMENTS; - if (db.ksi.used > result_max) - return HAL_ERROR_RESULT_TOO_LONG; - flash_block_t *block; hal_error_t err; - unsigned b; *result_len = 0; for (int i = 0; i < db.ksi.used; i++) { - b = db.ksi.index[i]; + unsigned b = db.ksi.index[i]; + + if (*result_len >= result_max) + return HAL_ERROR_RESULT_TOO_LONG; if ((err = block_read_cached(b, &block)) != HAL_OK) return err; diff --git a/ks_volatile.c b/ks_volatile.c index c416263..c8a424c 100644 --- a/ks_volatile.c +++ b/ks_volatile.c @@ -360,23 +360,27 @@ static hal_error_t ks_list(hal_ks_t *ks, if (ksv->db == NULL) return HAL_ERROR_KEYSTORE_ACCESS; - if (ksv->db->ksi.used > result_max) - return HAL_ERROR_RESULT_TOO_LONG; + *result_len = 0; for (int i = 0; i < ksv->db->ksi.used; i++) { unsigned b = ksv->db->ksi.index[i]; + if (ksv->db->ksi.names[b].chunk > 0) continue; + if (!key_visible_to_session(ksv, client, session, &ksv->db->keys[b])) continue; + + if (*result_len >= result_max) + return HAL_ERROR_RESULT_TOO_LONG; + result[i].name = ksv->db->ksi.names[b].name; result[i].type = ksv->db->keys[b].type; result[i].curve = ksv->db->keys[b].curve; result[i].flags = ksv->db->keys[b].flags; + ++ *result_len; } - *result_len = ksv->db->ksi.used; - return HAL_OK; } |