aboutsummaryrefslogtreecommitdiff
path: root/ks.h
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2017-05-29 13:16:14 -0400
committerRob Austein <sra@hactrn.net>2017-05-29 13:16:14 -0400
commit776c4e8cfed92bc2d894f002cb7d222abc65bb50 (patch)
treeaf7a7683b02aadf13b1f7480f3384c7f7345333f /ks.h
parentd2633bb4155c6798949e92d8113bc036b942a018 (diff)
Simplify per-session keys.
Cosmetic cleanup of pkey_slot along the way.
Diffstat (limited to 'ks.h')
-rw-r--r--ks.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/ks.h b/ks.h
index 44581a2..240d3e6 100644
--- a/ks.h
+++ b/ks.h
@@ -204,7 +204,6 @@ struct hal_ks {
unsigned cache_lru; /* Cache LRU counter */
unsigned cache_size; /* Size (how many blocks) in cache */
hal_ks_cache_block_t *cache; /* Cache */
- int per_session; /* Whether objects have per-session semantics (PKCS #11, sigh) */
};
/*
@@ -280,7 +279,8 @@ static inline hal_error_t hal_ks_block_erase_maybe(hal_ks_t *ks, const unsigned
ks->driver->erase_maybe(ks, blockno);
}
-static inline hal_error_t hal_ks_block_set_owner(hal_ks_t *ks, const unsigned blockno,
+static inline hal_error_t hal_ks_block_set_owner(hal_ks_t *ks,
+ const unsigned blockno,
const hal_client_handle_t client,
const hal_session_handle_t session)
{
@@ -290,7 +290,8 @@ static inline hal_error_t hal_ks_block_set_owner(hal_ks_t *ks, const unsigned bl
ks->driver->set_owner(ks, blockno, client, session);
}
-static inline hal_error_t hal_ks_block_test_owner(hal_ks_t *ks, const unsigned blockno,
+static inline hal_error_t hal_ks_block_test_owner(hal_ks_t *ks,
+ const unsigned blockno,
const hal_client_handle_t client,
const hal_session_handle_t session)
{