diff options
| author | Rob Austein <sra@hactrn.net> | 2017-05-23 00:05:49 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2017-05-23 00:05:49 -0400 |
| commit | d532e6bbcd63c550f91fc97446f6114f37d18bde (patch) | |
| tree | 5a532475837e7042e2a3cbd459e95a70592cfff2 /ks_volatile.c | |
| parent | 2b4dc660d9d10eed407851319bfe63d5f9c3acd1 (diff) | |
Whack previous commit with club until it compiles.
Diffstat (limited to 'ks_volatile.c')
| -rw-r--r-- | ks_volatile.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ks_volatile.c b/ks_volatile.c index f8bed1a..2dcb599 100644 --- a/ks_volatile.c +++ b/ks_volatile.c @@ -261,7 +261,7 @@ static hal_error_t ks_store(hal_ks_t *ks, goto done; } - if ((err = hal_ks_index_add(&ksv->db->ksi, &slot->name, 0, &b, &slot->hint)) != HAL_OK) + if ((err = hal_ks_index_add(&ksv->db->ksi, &slot->name, &b, &slot->hint)) != HAL_OK) goto done; uint8_t kek[KEK_LENGTH]; @@ -284,7 +284,7 @@ static hal_error_t ks_store(hal_ks_t *ks, if (err == HAL_OK) ksv->db->keys[b] = k; else - (void) hal_ks_index_delete(&ksv->db->ksi, &slot->name, 0, NULL, &slot->hint); + (void) hal_ks_index_delete(&ksv->db->ksi, &slot->name, NULL, &slot->hint); done: hal_ks_unlock(); @@ -309,7 +309,7 @@ static hal_error_t ks_fetch(hal_ks_t *ks, goto done; } - if ((err = hal_ks_index_find(&ksv->db->ksi, &slot->name, 0, &b, &slot->hint)) != HAL_OK) + if ((err = hal_ks_index_find(&ksv->db->ksi, &slot->name, &b, &slot->hint)) != HAL_OK) goto done; const ks_key_t * const k = &ksv->db->keys[b]; @@ -364,7 +364,7 @@ static hal_error_t ks_delete(hal_ks_t *ks, goto done; } - if ((err = hal_ks_index_find(&ksv->db->ksi, &slot->name, 0, &b, &slot->hint)) != HAL_OK) + if ((err = hal_ks_index_find(&ksv->db->ksi, &slot->name, &b, &slot->hint)) != HAL_OK) goto done; if (!key_visible_to_session(ksv, slot->client_handle, slot->session_handle, &ksv->db->keys[b])) { @@ -372,7 +372,7 @@ static hal_error_t ks_delete(hal_ks_t *ks, goto done; } - if ((err = hal_ks_index_delete(&ksv->db->ksi, &slot->name, 0, &b, &slot->hint)) != HAL_OK) + if ((err = hal_ks_index_delete(&ksv->db->ksi, &slot->name, &b, &slot->hint)) != HAL_OK) goto done; memset(&ksv->db->keys[b], 0, sizeof(ksv->db->keys[b])); @@ -412,7 +412,7 @@ static hal_error_t ks_match(hal_ks_t *ks, *result_len = 0; - err = hal_ks_index_find(&ksv->db->ksi, previous_uuid, 0, NULL, &i); + err = hal_ks_index_find(&ksv->db->ksi, previous_uuid, NULL, &i); if (err == HAL_ERROR_KEY_NOT_FOUND) i--; @@ -464,7 +464,7 @@ static hal_error_t ks_match(hal_ks_t *ks, continue; } - result[*result_len] = ksv->db->ksi.names[b].name; + result[*result_len] = ksv->db->ksi.names[b]; ++*result_len; } @@ -495,7 +495,7 @@ static hal_error_t ks_set_attributes(hal_ks_t *ks, goto done; } - if ((err = hal_ks_index_find(&ksv->db->ksi, &slot->name, 0, &b, &slot->hint)) != HAL_OK) + if ((err = hal_ks_index_find(&ksv->db->ksi, &slot->name, &b, &slot->hint)) != HAL_OK) goto done; ks_key_t * const k = &ksv->db->keys[b]; @@ -556,7 +556,7 @@ static hal_error_t ks_get_attributes(hal_ks_t *ks, goto done; } - if ((err = hal_ks_index_find(&ksv->db->ksi, &slot->name, 0, &b, &slot->hint)) != HAL_OK) + if ((err = hal_ks_index_find(&ksv->db->ksi, &slot->name, &b, &slot->hint)) != HAL_OK) goto done; const ks_key_t * const k = &ksv->db->keys[b]; |