diff options
author | Rob Austein <sra@hactrn.net> | 2017-05-30 18:54:41 -0400 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2017-05-30 18:54:41 -0400 |
commit | f3a7d2993b46e981208ac68996db609a31d80163 (patch) | |
tree | e32e9fbbfcc1017d8755fc8aeab67dc288cd5e0e /ks.h | |
parent | ade02ebabf88481bc763ea6a9b2f97e87f0a6210 (diff) | |
parent | 358b3803cdedad607cf649221d0b7e3ce66b45f2 (diff) |
Merge branch 'logout' into ks9
The internal keystore API has changed enough since where the "logout"
branch forked that a plain merge would have no prayer of compiling,
must less running. So this merge goes well beyond manual conflict
resolution: it salvages the useful code from the "logout" branch, with
additional code as needed to reimplement the functionality. Sorry.
Diffstat (limited to 'ks.h')
-rw-r--r-- | ks.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -223,12 +223,14 @@ struct hal_ks_driver { hal_error_t (*test_owner) (hal_ks_t *ks, const unsigned blockno, const hal_client_handle_t client, const hal_session_handle_t session); hal_error_t (*copy_owner) (hal_ks_t *ks, const unsigned source, const unsigned target); + hal_error_t (*logout) (hal_ks_t *ks, const hal_client_handle_t client); }; /* * Wrappers around keystore driver methods. * - * hal_ks_init() is missing here because we expose it to the rest of libhal. + * hal_ks_init() and hal_ks_logout() are missing here because we + * expose them to the rest of libhal. */ static inline hal_error_t hal_ks_block_read(hal_ks_t *ks, const unsigned blockno, hal_ks_block_t *block) |