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.

1 files changed, 12 insertions, 0 deletions

diff --git a/ks.c b/ks.c
index e966b94..92dc303 100644
--- a/ks.c
+++ b/ks.c
@@ -461,6 +461,18 @@ hal_error_t hal_ks_init_common(hal_ks_t *ks)
 }
 
 /*
+ * Log a client out of a keystore.
+ */
+
+hal_error_t hal_ks_logout(hal_ks_t *ks, const hal_client_handle_t client)
+{
+  return
+    ks == NULL || ks->driver == NULL ? HAL_ERROR_BAD_ARGUMENTS   :
+    ks->driver->logout == NULL       ? HAL_ERROR_NOT_IMPLEMENTED :
+    ks->driver->logout(ks, client);
+}
+
+/*
  * Test whether we like a particular key type.
  */